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