Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module"