Merge "Merge "Streamline testInstall_compatibleContext()" am: 476d58c6 am: 28868907" into oc-dev-plus-aosp