[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: 100fd3ee -s ours

am skip reason: subject contains skip directive

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



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