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

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

Change-Id: I5dbae359a8c73864322beb44dbe6856af478df65