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

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



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