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

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

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