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