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