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

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

Change-Id: Ie1f7f8707dfda71df646c1363a1a7e238301838d