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