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

am skip reason: Merged-In I4022b86e58329e1d7182129563d859d87c43831d with SHA-1 a47e8c47fe is already in history

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

Change-Id: I7d5c161ae3cbe207355a3e732335f48f37f96cf2
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 9219b2360d9e43e1cfd19140fbbae18c760d614e
  1. apex/
  2. framework/
  3. service/
  4. tests/
  5. OWNERS
  6. PREUPLOAD.cfg