[automerger skipped] Merge 24Q3 to AOSP main am: d69994e840 -s ours

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

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

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