Merge "Require location permission for ConnDiags WiFi only." into sc-dev