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

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

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