[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 -s ours
am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 519f1201ca is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11892958
Change-Id: Ia8d500395dfd5fefac69025452bae071182e27e3
This commit is contained in: