Merge changes from topic "vogar-testng-support" am: d18c4a64ca am: d584d35232

Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2053949

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