[automerger skipped] Compat-framework on ravenwood am: 97f3b8a5e6 -s ours am: bec43a31ae -s ours

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

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

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