Merge "Allow shared_relro to connect to activity_service."