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

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

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



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