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: f0e5a289 am: b17a96d0 am: 9fe674cc am: 453f9452 am: c5f78698 am: d1b137a8

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



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