(TM-MP) Rb back compat: Base changes (go/rbc-design) 2p: b0915ceae9

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

Bug: 263816046
Change-Id: Ia583fddcb88a21b5c739c7438c07967e7e581099