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