[automerger skipped] (TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 am: 07e40c436f am: 289689dc53 -s ours

am skip reason: Merged-In Ia583fddcb88a21b5c739c7438c07967e7e581099 with SHA-1 103d5b5a62 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21481657

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