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

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

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