[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: ce53e793 -s ours am: 9858e4b1 -s ours am: c06bc04f -s ours am: 263575f7 -s ours

am skip reason: Change-Id Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4 with SHA-1 fb57ebf8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12470019

Change-Id: Ic474a72fd04fc074c6a5fab1b123395552756248