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

Change-Id: Ib2abfdf4a3d445a3e404877d6187480f86e4956f