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

Change-Id: Ib2a6a75dfaceaefbbc30524af5bb5dd5339e7f90