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

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

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

Change-Id: Ifc1041b6e6755567c1ff2343b819e6125ed55942
tree: 6ace48e245836b349db1f128df56253566d49418
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk
  6. METADATA