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

Merge "Merge "Fix NPE" into rvc-dev am: e26a6086 am: 37d0062f am: d3910354 am: f0e5a289 am: b17a96d0 am: 9fe674cc am: d731d2a4" into tm-d1-dev-plus-aosp am: 143bab0b am: cfb3682a

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



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