[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: b296381136 -s ours am: c92e495db1 -s ours am: f3be57d347 -s ours

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

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

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