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

Merge "[Ravenwood] Move bivalent test into the "test" directory" into main am: af43c947 am: 99fe029b

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



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