Merge "Skip remountUid for system_server"