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

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

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