Merge "Merge "Move AppStandbyController calls out of UsageStats lock" into...

Merge "Merge "Move AppStandbyController calls out of UsageStats lock" into rvc-dev am: 5d544ddf am: d476c27f" into rvc-d1-dev-plus-aosp am: 0ec93dfa am: c976f0ee

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

Change-Id: I5e6160d24984c3b7d9e03606d581882ade4e7d0e