[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am: 933ad6e1c8 -s ours am: 7bc82e9e2b -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867
Change-Id: I99c62f5c4b75c42313498fec8d50ef2d29194b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: