[automerger skipped] Merge "Enforce...

[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e03 am: 0e7ecf6f -s ours am: a9541909 -s ours am: e6871844 -s ours am: 769a0d36 -s ours

am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873 is already in history

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



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