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