Merge "[Ravenwood] Move redirection classes out of f/b/r" into main am: e778d91b

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



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