Merge "Add NEARBY_WIFI_DEVICES to shell permissions for CTS"