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