[automerger skipped] Merge Android 13 QPR1 am: 9a11661453 -s ours am: 55ebac7c64 -s ours

am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386

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