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

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

Change-Id: I7f2369e7406517ee39d2738f25e44f6c29a4c637