[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3c3a4d9cb4 -s ours am: 736cad9eec -s ours

am skip reason: Merged-In I9183c2f8b1cae60b705016804cb36780513be854 with SHA-1 6b10ec9a31 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/3258513

Change-Id: I6444ee561dced0515d7958d7fab49b4ba5ae3eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: ef2407d3da03e3f1cb9d54d8e60b918159e6db5f
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS