Merge "[Nfc] Remove CONNECTIVITY_INTERNAL permission"