Merge "Import all useful methods from ModuleTestUtils" am: 79b28fc738 am: aaa68206d8 am: c87e646680

Original change: https://android-review.googlesource.com/c/platform/cts/+/1486203

Change-Id: Ifa8018c26c75b0aecad4829e2fb482ebfc5da735