Merge "Fix people widget crash" into udc-dev am: 2c9783b3 am: 40f65a65

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



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