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