Merge "Adding null check to prevent NPE" into tm-dev am: da9b7dca am: aaf5eb43 am: f92ea6dd am: 5f48173d

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



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