Merge "Add null pointer check to avoid system crash." am: a04929ef9e am: ed06ccd402 am: d28b73315c am: 913cc9a60a

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

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