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