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