[automerger skipped] [DO NOT MERGE] Respin request for "@JavaOnlyStableParcelable is not available" fix backport. am: 89eba4a4a7 am: b38827ee94 -s ours am: f85374a1dc -s ours am: 478945fe11 -s ours am: 9f99a6aca5 -s ours

am skip reason: contains skip directive

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

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