[automerger skipped] Merge changes I9881453b,I57fa88c6 into stage-aosp-master...

[automerger skipped] Merge changes I9881453b,I57fa88c6 into stage-aosp-master am: c227f6f1 am: d0498033 -s ours am: 8f1c25ef -s ours

am skip reason: Merged-In I9881453ba14cba4f219861ec4449f2baa8058b57 with SHA-1 e644ff61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16904914

Change-Id: Id4dd3a807d2eef4e8fd1463f293ff6b2a5a5cb76