Merge "Fix policy transparency for user restrictions" into udc-dev am: d9caad58

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



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