[automerger skipped] Merge Android 13 QPR1 am: 596f5c72 -s ours am:...

[automerger skipped] Merge Android 13 QPR1 am: 596f5c72 -s ours am: 7458721a -s ours am: c8a3ced6 -s ours

am skip reason: Merged-In I041d1b146afdffa0ba62b604a8fe6c0f59e1ddd9 with SHA-1 fb53f963 is already in history

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



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