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