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