[automerger skipped] sm: disableBackgroundScheduling am: 563207f705 -s ours am: 632a147ec3 -s ours

am skip reason: Merged-In Ic6dee63b072cd463a4880df15aa01832badd647c with SHA-1 310fce2f0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24623254

Change-Id: Ic641d8af1d751ad803007e357fd9212e3ae86ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>