[DO NOT MERGE] Respin request for "@JavaOnlyStableParcelable is not available" fix backport. am: 2637527fd5

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

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