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

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



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