[automerger skipped] [DO NOT MERGE] Respin request for "@JavaOnlyStableParcelable is not available" fix backport. am: 2637527fd5 am: aa66129b3f am: 614782e99e -s ours am: 04c4bc9e66 -s ours am: 5885cee859 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/24044297

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