Merge "Fix NPE" into rvc-dev am: e26a6086 am: 37d0062f am: d3910354 am:...

Merge "Fix NPE" into rvc-dev am: e26a6086 am: 37d0062f am: d3910354 am: 83b027c2 am: baeb6516 am: 6ece87d1 am: 2b53aa7c am: 207baf0a

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



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