Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd am: 2886890793" into oc-dev-plus-aosp
am: 37b52721ec

Change-Id: Ie057e5a870c9e58b4999cecb56c19aaca6183121