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

Change-Id: If58174412aeaaad00a49143c67c19e1fef191709