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