1e70c22af9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0428b441b34d48157a28dfc0463976be135146f4