[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363"...

[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: b2963811 -s ours am: c92e495d -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: Ic919463bed4aa9a0962e8d15bb0b86cd3f4b8a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>