[automerger skipped] Merge changes...

[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672df -s ours am: 77ba2870 -s ours

am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 75dec290 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4300049cb11249c703f6f5c8fbcda5a14c569b5f