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