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

Change-Id: I43b7bb188a723e131056adc5e85571003c0bad21