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

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

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