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