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