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

[automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: ea10b988 -s ours

am skip reason: Merged-In Ia1185100aa3ed621697c872ebc8379047fbbaeb3 with SHA-1 9b288a09 is already in history

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



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