[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am: 7c3413361b -s ours am: aafebf55b8 -s ours

am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history

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

Change-Id: I6fbd3ae2f8147350c51141effcdbf27469a70a12