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