Merge "Add `MainlineTestModuleController` support to `CtsLibcoreOjTestCases`." am: 484b93e6e2

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

Change-Id: I4f9d5c0ac5a57a8581692fca2a9cbbc211fbba83