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