[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 20bbda6c -s ours am: c20e6eef -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: I4349e5887bb16ccd694551b8d7a9d1a4fe8bc10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>