Merge "Handle errors during policy loading from file" into udc-dev am: c9fd9867 am: ed6f41aa

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



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