Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da

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

Change-Id: If26fbc900b82beeab1f68d6e68c7eb1903ee9db9