Merge "[Nfc] Remove CONNECTIVITY_INTERNAL permission"
am: 32a1848d72

Change-Id: I671b9c55fd355a6829855248565807c6370afe01