Merge "Fix widget picker crash" into udc-dev am: 6c3c6b3a am: fc67846a

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



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