Merge "Remove dependency on ModuleTestUtils" into rvc-qpr-dev-plus-aosp