Merge "Fix NPE" into qt-dev am: 261b601d am: 23ffc379 am: bdb417dc am: 6a00b134 am: ddaa966c

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



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