Merge "Adding null check to prevent NPE" into tm-dev am: da9b7dca am: 843f0478

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



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