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