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