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

Change-Id: I2d9a30cb879a2b689f5519b8d4c066de1265f0df