[automerger skipped] Merge "Enforce...

[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into sc-dev am: 84a6ab8a am: c126c640 am: f9cbf902 -s ours am: b4e180f3 -s ours am: b00fb4ab -s ours

am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 99b199d1 is already in history

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



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