Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into udc-qpr-dev-plus-aosp am: 91c3e28e8e -s ours

am skip reason: Merged-In I83eccf007baba511b15fbde9327d3459d62adb51 with SHA-1 00f142ef43 is already in history

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

Change-Id: Idca4fc9721ea751b976e68e53ca90e2e87665374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c978d1127859f37e1e2cd006fdca99a03712a6f0
  1. apex/
  2. framework/
  3. service/
  4. tests/
  5. OWNERS
  6. PREUPLOAD.cfg