[automerger skipped] Merge Android 12 am: dc61e265e9 -s ours am: 15fff2cd53 -s ours am: 11da7853d1 -s ours am: 9258ec6096 -s ours

am skip reason: Merged-In I6c7636a849252991691566d6c615b9a82300d19e with SHA-1 68665197ae is already in history

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

Change-Id: Ic4b9310d048c936bae9cb50a9de392a6f145aa59
tree: ad3be70f27e23835238b51f7eff6ac8beae0fff9
  1. apex/
  2. framework/
  3. service/
  4. tests/
  5. OWNERS
  6. PREUPLOAD.cfg