Merge "Merge "Handle null fields when using parcels." into udc-dev am:...

Merge "Merge "Handle null fields when using parcels." into udc-dev am: 54d0caca am: 5cff737e" into udc-d1-dev-plus-aosp am: 5ad58245

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



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