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

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

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