[automerger skipped] Merge "Enforce...

[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into tm-dev am: e9fd0fc7 am: 93863fba -s ours am: 58e26a22 -s ours

am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 269fcb68 is already in history

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



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