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