Merge "Merge "Fix NPE" into rvc-dev am: e26a6086 am: 37d0062f am: d3910354 am: 83b027c2 am: baeb6516 am: 9dbf552c" into udc-dev am: b70fb148 am: 4c90c605

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



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