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

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

Change-Id: I0b6fba539144748868f739c5ad5a6661fec11868