Merge "Keep InstrumentationTestCase in main dex am: cd1fc050 am: 5e583b06 am: 22669b33" into oc-mr1-dev-plus-aosp