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