Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe

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

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