Merge "Rb back compat: Base changes" into tm-mainline-prod am: 82c1901ee3

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/21185749

Change-Id: If5212300df4b612c9f54ca61e9f5b1414c3fa7dd
Merged-In: I366d3778a3983aa83537ec20a213586312448d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 263816046
Ignore-AOSP-First: Automerger fix