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

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

Change-Id: Ibd8bc1afd01ed52b8fc4d78e1cc2a8142ddd5daa