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