Merge "Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31 am: d39103545d am: f0e5a2896b am: b17a96d0e7 am: 9fe674cccb am: d731d2a4e8" into tm-d1-dev-plus-aosp am: 143bab0bc8

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

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