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

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

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



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