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

Change-Id: I1fab5a10644d7f24a304e24f373461c72c03d9a6