Merge "WifiScoreReportTest: fix to pass on Android R" into sc-dev