Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
am: ed285e0cd6

Change-Id: Iae9b1317dc53a8213861ff3803764f9d45758f71