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

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

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



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