Merge "Stop using _upstream suffix, and remove visibility checks on...

Merge "Stop using _upstream suffix, and remove visibility checks on ClearcutJunitListener." into main am: 8440f9d2 am: 7499060d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3431175



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