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