[conflict] Merge "Move ravenwood tests to f/b/r/tests" into main am: 4deeb409 am: 4f02e86a

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



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