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

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

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