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