Merge "Compat-framework on ravenwood" into main am: 97fc967a89

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

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