[automerger skipped] Merge "[Ravenwood] Move redirection classes out of f/b/r"...

[automerger skipped] Merge "[Ravenwood] Move redirection classes out of f/b/r" into main am: e778d91b am: d6c6211d -s ours

am skip reason: Merged-In I0d4f2c399e3ba10ff95d690a01fc0bbfb2f8d585 with SHA-1 8aea64ec is already in history

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



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