[automerger skipped] Merge "Added check for user info is not null" into...

[automerger skipped] Merge "Added check for user info is not null" into tm-qpr-dev am: 1d9daf50 -s ours

am skip reason: Merged-In Ieacbb35e522b35353c96de1f162a8a71388b4b04 with SHA-1 799c6528 is already in history

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



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