Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767 Change-Id: If1d0eb5a1818dd7a9346f8d0d64d5f37ea1b53c2