Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6 am: 28868907" into oc-dev-plus-aosp am: 37b52721 Change-Id: Ie057e5a870c9e58b4999cecb56c19aaca6183121