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

am skip reason: Merged-In Ic65dcf183b613ad99922a0664773402e37e1dc34 with SHA-1 69a3119902 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ConfigInfrastructure/+/27273845

Change-Id: I59a2f1afe40b5f3aac9dc1e81f5cf88518e75a67
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 3a716566b6214f83376d497e6c20932eb7fae070
  1. apex/
  2. framework/
  3. service/
  4. OWNERS
  5. TEST_MAPPING