Merge "(TM-MP) Rb back compat: Base changes" into tm-mainline-prod am: 15a5bdb9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21186901



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