Merge "Fix the BaseSettingsProviderTest to correctly verify broadcasts that don't arrive immediately. Update the location settings permission related tests that had subtle problems masked by the missing verification step."