Merge "Remove CONNECTIVITY_INTERNAL permission" am: a785f7bf4c am: eb5bee128c

Change-Id: I5195f9258f93034747ee118d817cb03cd86051f9