9c9887381c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549965 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5f82f7d8ea56944f1243cca55aa6631dc53d29d4