Merge "Enable mediapc tests on devices running Android R"