Merge "Move NMS to CONNECTIVITY_INTERNAL permission."