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