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

Change-Id: I691de648a1f99555423ec0ab04c0a68bb7ab5c81