Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9

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

Change-Id: Iaa3eaadd033a9b839cc8f74e0de3f10cd37e428e