Merge "Update logic for adjusting standby buckets for restored apps." into...

Merge "Update logic for adjusting standby buckets for restored apps." into tm-qpr-dev am: 9960d8b5

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



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