Merge "[Ravenwood] Move bivalent test into the "test" directory" into main am: af43c947d4

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

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