Merge "Parcel marshall error explain objects" am: ccc3f246 am: e9a5b399...

Merge "Parcel marshall error explain objects" am: ccc3f246 am: e9a5b399 am: a74545bf am: bba040da

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



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