Merge "Do not return devices when caller has no location permission" into mnc-dev