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

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



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