Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6bd am: 2886890793" into oc-dev-plus-aosp