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

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



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