aml_hef_341114030 (10906182,com.google.android.healthfitness)
(TM-MP) Rb back compat: Base changes (go/rbc-design) am: b0915ceae9 am: 07e40c436f

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

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