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

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



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