Merge "SystemUI: add NETWORK_SETTINGS permission" into oc-dev