Merge "Improve run-ravenwood-tests.sh" into main am: 1f0a87ef4d am: e0be8d4149

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

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