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