Merge "cleanup up appRestrictions policy in the policy engine" into udc-dev am: 9088ec46 am: 4b560f20

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



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