Merge "Add some extra exception catching/logging to readxml" into tm-dev am: 2ca31b10

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



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