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

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

Change-Id: I106956bce8783a8f8719b80bf5885f1b7d48f241