Merge "Keep InstrumentationTestCase in main dex am: cd1fc050 am: 14e225f7" into oc-dr1-dev-plus-aosp am: 1544c9b6 am: 2048afb0 Change-Id: Ib2a6a75dfaceaefbbc30524af5bb5dd5339e7f90