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

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

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