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