[automerger skipped] Merge "Catch IllegalArgumentException as it might indicate corrupted packages.xml" into main am: f529541e1a am: cecf9356ec -s ours

am skip reason: Merged-In Icea3d175ae899413ee28b052086bd9f12a189aea with SHA-1 49e7f33226 is already in history

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

Change-Id: Iffd27194bbb463f1eed9a3e78f99388ffb304d92
Signed-off-by: Automerger Merge Worker <[email protected]>