[automerger skipped] Merge "Handle errors during policy loading from file" into udc-dev am: c9fd986778 am: ed6f41aa90 am: 2b5708e37c -s ours
am skip reason: Merged-In Id47f482e9fced82b42090eabed6297f2ebba223e with SHA-1 4a2989dbba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23127279
Change-Id: I8346844dc8b4f135b3e1eab53861ddb542e61f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: