[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6da222fc09 -s ours

am skip reason: Change-Id If59a1a4a9c779b41916cbea378d885e1295ac15c with SHA-1 fad1e7d9a1 is in history

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

Change-Id: I69c136979a325f4896232ab7357eb52af6f3fb83