Merge "Prevent any more JUnit 3 based tests on Ravenwood" into main am: 6f515de0 am: c34f7a95

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



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