[automerger skipped] [DO NOT MERGE] Respin request for "@JavaOnlyStableParcelable is not available" fix backport. am: 89eba4a4a7 am: 6b3d2317e3 am: b69c50e1e1 -s ours am: 638c6cb95a -s ours

am skip reason: contains skip directive

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

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