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

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

Change-Id: Idc81838d965832f5d97af67e0006565fe93a3a76