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