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

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

am skip reason: skipped by user delphij

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



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