Merge "SDK Parcelables: @JavaOnlyStableParcelable" into main am: c120605de6 am: 62a7402d2b

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

Change-Id: I3d5c16119507e80ca40a37285c931043dd004465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>