Merge "Fix applicationrestrictions with delegate." into udc-dev am: ee70a183

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



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