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

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 am: 7b220daa

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



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