Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da

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

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