Merge "Keep InstrumentationTestCase in main dex am: cd1fc05021 am: 14e225f7d6" into oc-dr1-dev-plus-aosp