[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am:...

[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda -s ours am: 94429852 -s ours am: 5d179621 -s ours am: c2ad6cae -s ours

am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 26aab146 is in history

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

Change-Id: Ie4299cfa86d76b1c47476863f36b7c23718f7c7f