(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/21173774 Change-Id: If240d22844ce47df705295965261537d13bb4654 Merged-In: Ia583fddcb88a21b5c739c7438c07967e7e581099 Signed-off-by: Automerger Merge Worker <[email protected]> Bug: 263816046 Ignore-AOSP-First: Automerger fix