[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 8a449961bb -s ours

am skip reason: Merged-In I788c30fb4c678b3c79328d77b2f9f9f5da36e094 with SHA-1 1de729733a is already in history

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

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