[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: 36d6c8fd -s ours

am skip reason: subject contains skip directive

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



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