[automerger skipped] Merge changes I9881453b,I57fa88c6 into stage-aosp-master am: c227f6f1e0 am: d049803340 -s ours

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

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

Change-Id: I9b75911635c79d2d3a2cd864a9eab30ab46225c3