[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 38f1a5dcb4 -s ours

am skip reason: Merged-In I5c0fb04121f17f5ad4ebb0e5129cb10ab2710608 with SHA-1 349c16128b is already in history

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

Change-Id: I8b43eb237ab6ebeff64ab31b63e3662a3c267c1d
Signed-off-by: Automerger Merge Worker <[email protected]>