[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672dff6 -s ours
am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 246d176689 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432447
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I053b05625069920a308a0ec96cf34641644beffe
This commit is contained in: