Merge "Revert "Changing readParcelable and readSerializable's method signatures."" am: de1df073cb am: c75c2e1818 am: 50f0139d43 am: 41285faf9a

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

Change-Id: I158b6db9798b98c6b668d42b19c9a136b138e038