Merge "Add a null check to avoid NPE." into tm-qpr-dev am: f802af27 am: c030e076

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



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