Merge "Update standby buckets for restored apps." into tm-qpr-dev am: 8d296990 am: bd58f61b

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



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