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

[automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 058bc15a -s ours am: 4bc0cb7c -s ours

am skip reason: subject contains skip directive

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



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