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: I9fb2b4a0156738a851fc5f9a03c53337bf868a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>