tree 4d6bd43390646edb97fc772202478c632361301e
parent 6356f9dee8cd5ef414aa24599461f00c17ca1f41
author Kholoud Mohamed <kholoudm@google.com> 1671012799 +0000
committer Kholoud Mohamed <kholoudm@google.com> 1673021215 +0000

Resolve policies that could be set locally and globally

Also added userControlDisabledPackages policy

Bug: 258442697
Bug: 232918480
Test: atest android.devicepolicy.cts.UserControlDisabledPackagesTest
Change-Id: I4ce87c0351f5b76ac77ba0ec556a9b4dbf6b0ac1