Merge "Permission changes for scoring in Wifi Picker."