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

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

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