634c81f7e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ec4e1ad60bd8081ef37641722e247464ecd34e9