Merge "Fix NPE" into qt-dev am: 261b601d

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



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