Merge "Fix people widget crash" into udc-dev am: 2c9783b3 am: 4fd6c9e4 am:...

Merge "Fix people widget crash" into udc-dev am: 2c9783b3 am: 4fd6c9e4 am: da63ebd5 am: c5b2f9ca

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



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