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