[automerger skipped] Merge "Merge TQ2A.230405.003" am: 6bc9a812 am:...

[automerger skipped] Merge "Merge TQ2A.230405.003" am: 6bc9a812 am: 86144cc6 -s ours am: 4af69c23 -s ours am: 4669a143 -s ours

am skip reason: Merged-In I6e17d5d7a598fb01f3bf75f2df88d63d187231d9 with SHA-1 6f0e8e89 is already in history

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



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