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

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

Change-Id: Iaef6f3bd68561b879bf0d1600b7296b5c39b225a