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