95d6ec4a52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2588d9be48b50d41aaf5a5440268bb377081242