Merge "Catch IllegalArgumentException as it might indicate corrupted packages.xml" into main am: f529541e1a

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

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