[automerger skipped] Merge "Revert "Compat-framework on ravenwood"" into main...

[automerger skipped] Merge "Revert "Compat-framework on ravenwood"" into main am: 9fe82166 -s ours

am skip reason: skipped by omakoto

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



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