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: 3bab94ce am: 182bff94 am: be4bddc7 am: dec0c59a" into tm-d1-dev-plus-aosp am: 2a7d9570

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



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