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

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

Change-Id: Id111b38163356f7b8a7dde7db200059a9b1799d7