Merge "Fix the flaky sched group with the BIND_SCHEDULE_LIKE_TOP_APP" into udc-qpr-dev am: 0d033113d9

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

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