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

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

Change-Id: I24500f0428749baf7e1da43464982c1bd15c28f2