Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6
am: 0ef4ea95f2

Change-Id: Ib196133e3affc2a9adc8bb66ffdf7dbf0792d307