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