Merge "Add error handling to prevent IllegalArgumentException" into udc-qpr-dev am: 9e6a845c

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



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