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