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

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

Change-Id: If7de308e91a5b5a8f1c110ec2ba62d7b695a4c1d