Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: b088f96ef5 am: a83081d783 am: 7554a7e4b0

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

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