Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6" into stage-aosp-master am: 9dcf6143" into oc-dev-plus-aosp