[automerger skipped] Merge "Merge Android 13 QPR1" am: cc5853e8 -s ours am: e8485333 -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: Ibf628e587925c4af0ae31f56d88b7d2c82ee8686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>