[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 4b2a670fee -s ours am skip reason: Merged-In Ie6230c099294a336e8673cd233ee7b24b01d3df5 with SHA-1 92579b465d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/27273332 Change-Id: Ib002cb69346ba3e23e66e61d45185d2a6bc6942a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>