Merge "Check for null data buffer in AParcel_marshal" am: eec41c20fc am: 528641b0a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2397532

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