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

am skip reason: subject contains skip directive

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

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