Merge "Parcel marshall error explain objects" am: ccc3f246

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



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