[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into sc-dev am: 84a6ab8a49 am: c126c64035 am: f9cbf9020c -s ours am: b4e180f307 -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 99b199d113 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22311042
Change-Id: I08be99c45770d6dcb353a041219a0ab8585d36b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: