Merge changes from topic "vogar-testng-support" am: d18c4a64ca am: d584d35232 am: d58214079a am: 48f1c17d95 am: 01fc1af3a1

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

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