[automerger skipped] Merge "Rb back compat: Base changes" into tm-mainline-prod am: 82c1901ee3 am: 43d8b2a74e am: 3a067b5d70 -s ours

am skip reason: Merged-In I366d3778a3983aa83537ec20a213586312448d12 with SHA-1 e018eb053c is already in history

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

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