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

Change-Id: Ica715d36549f120a63ad70ce348ba6032ffc3eaa