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

Change-Id: I92c11ada920117d3982abc63e12f5906196149f0