[automerger skipped] Merge "Merge TQ1A.221205.012" into stage-aosp-master am:...

[automerger skipped] Merge "Merge TQ1A.221205.012" into stage-aosp-master am: 4df78bab -s ours am: c0d3b311 -s ours

am skip reason: Merged-In Ib19afd740e10d8bc26fc173641f7463719d079fd with SHA-1 c5166b2a is already in history

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



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