tree 73a30bdd0008c4177b49ce5e8f39788c34e539ef
parent 756198798f312b5248f43b1b80281688d257d610
parent 15a5bdb9535af8dc78deb418b6e32c728593e94a
author Neha Pattan <npattan@google.com> 1676658895 +0000
committer Neha Pattan <npattan@google.com> 1676671765 +0000

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

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