(TM-MP) Rb back compat: Base changes

Bug: 263816046
Test: manual
Ignore-AOSP-First: Internal feature
Change-Id: I451c7d22ecc85e63f73ac444ea0022d7cc60ee7c
1 file changed