Merge "Ensure media tests use androidx test runner by removing deprecated InstrumentationTestRunner from manifest." into pie-cts-dev