Merge "Added check for user info is not null" am: 1206d8d7

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



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