Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd" into stage-aosp-master am: 9dcf614397" into oc-dev-plus-aosp
am: d7e6de2267

Change-Id: I071316f1e00d71edb16d17bb8c2971ec7f665768