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