[automerger skipped] Merge "Compat-framework on ravenwood" into main am: 97fc967a89 am: be3c5be3a1 -s ours

am skip reason: Merged-In Ibef0180fe3e5acb919cb6cbab09574c508e6d894 with SHA-1 b4207ae4b5 is already in history

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

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