[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 80279348 -s ours am: 3cbeba82 -s ours

am skip reason: Change-Id I72658443fde61aa5f10463fcc42772daf4143ed0 with SHA-1 55f730f7 is in history

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

Change-Id: Icab27d8d2110503a989fccdf27ab7728d356af46