Merge "Added check for user info is not null" am: 1206d8d7 am: 97efff46 am: 61b94156

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



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