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

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

Change-Id: If5ecf9db638a32fcdeb1ed59d338c7c0e1313c85