Merge "Fix NPE when removing policies." into udc-dev am: f76eaf9a

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



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