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