Merge "Adding null check to prevent NPE" into tm-dev am: da9b7dca am: aaf5eb43 am: bb9a40aa am: 9a0bce3f

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



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