Merge "SystemUI: add NETWORK_SETTINGS permission" into oc-dev am: 276b63dc9e
am: 75a7b33a1a

Change-Id: I4b793246f4fe1c6ac6fcacb8e1d84cdd9f2e3214