[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 9a41b7ee -s ours am: 05e3fc10 -s ours

am skip reason: Merged-In Ie59b0bd34222bb901f93dc67061cde0d919f3a24 with SHA-1 d267aca7 is already in history

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



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