[automerger skipped] Merge "Add error handling to prevent IllegalArgumentException" into udc-qpr-dev am: 9e6a845ca4 am: ad147bbc0d -s ours

am skip reason: Merged-In Iddbe55c1ff66b067f8456d058cbc60a2a698c4ae with SHA-1 0fb4b268e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24622404

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