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

Change-Id: Id17a45f03d60c3a3047f9cd0fcd8f021f3aa75a1