[automerger skipped] Merge "Merge TQ1A.230205.002" am: decb6cdb -s ours

am skip reason: skipped by user delphij

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



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