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

Change-Id: I9ad7c61b3a068246d486f81ec4d0929ebd787ace