Merge "Remove CONNECTIVITY_INTERNAL permission"