Merge "Prepare for compat-framework support" into main am: 93611796a2 am: 69f7f61564

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

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