Merge "Parcel interface token methods @NonNull." am: 403f00bfb8

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

Change-Id: Ica39b914561ef61fb15ba06de9451a08c9102d4c