Merge "Merge "Test that uninstall activity hides overlays" into rvc-dev am: 1dbeb76392 am: c52394388c am: 553c0e72a5" into rvc-qpr-dev-plus-aosp