Merge "[WIFI][LOCATION] App note FINE permission even for legacy apps"