15449e9675
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36823fd39cda558ee5c3eef9d7ef55d44a3c466c