[automerger skipped] Merge changes...

[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a43 -s ours am: 1835b5e2 -s ours am: 0b9d5a26 -s ours

am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 9d680e7c is already in history

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

Change-Id: I2f4ae9a474007eb1b2d63c20463f28d21e54aa14