[automerger skipped] Merge "(TM-MP) Rb back compat: Base changes" into...

[automerger skipped] Merge "(TM-MP) Rb back compat: Base changes" into tm-mainline-prod am: 15a5bdb9 am: d5144011 -s ours

am skip reason: Merged-In I586521b19121c52f87c8bf1d0105dcf9ffc09ff7 with SHA-1 d9b85287 is already in history

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



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