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