[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 6c02fa5f -s ours

am skip reason: Merged-In I0d776f3fbdbba925cf1ac272270fb36f286dff91 with SHA-1 436c4c88 is already in history

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



Change-Id: Id57be4ffe57910ffb2792245e9f8a124a79f620b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>