[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 am: 57ac59568c -s ours

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

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

Change-Id: I0d9e8484e30a9cc730897841779b454a86a4ca52