[automerger skipped] [DO NOT MERGE] Respin request for "@JavaOnlyStableParcelable is not available" fix backport. am: 2637527fd5 am: 86ef37ad01 -s ours

am skip reason: subject contains skip directive

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

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