Integrate the latest changes am: a398478e6c am: b2f7be03bc

Original change: https://android-review.googlesource.com/c/platform/platform_testing/+/3027141

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