[automerger skipped] Merge "Add null check for session_info." into udc-qpr-dev...

[automerger skipped] Merge "Add null check for session_info." into udc-qpr-dev am: 499f2ff0 am: bed85b75 -s ours

am skip reason: Merged-In Iec68681e940cbff68160c7300d1634f3e6cd2f46 with SHA-1 6017d722 is already in history

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



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