Merge "Correct Parcel value types" am: 861d2e12cb am: e9ffc7f08f am: 633ca9c492 am: ac52200025 am: b87435bdec

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

Change-Id: I4968627d5b65b20872c1c6c0418da88460da93b3