Merge "Keep InstrumentationTestCase in main dex am: cd1fc05021 am: 5e583b06a5 am: 22669b33e0" into oc-mr1-dev-plus-aosp