Merge "Parcel interface token methods @NonNull." am: 403f00bfb8 am: f74b2d4192 am: 008ff2619b am: 92bcee154f

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

Change-Id: Ie8c367e500572f3cb1cf8817d28141d52b06867e