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

Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892