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

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



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