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