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