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