[automerger skipped] Merge "Handle errors during policy loading from file" into udc-dev am: c9fd986778 am: 68cc32e40c -s ours am: 7d0f48c3c6 -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: I0ce3e4effdd2bd5ed6ea5dedea4a960c6ddb8ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: