11bb09eb21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1f3a928ed881ddd9826675f4729f35d9d0f1727