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

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

Change-Id: I9cab7d61cfe9fcf6e551b6c225bd36fd222b1753