Merge "Correct Parcel value types" am: 861d2e12cb

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

Change-Id: I0ad34ad29a54cf58ac37ec347a59b45a59959ea1