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

Change-Id: I4b473c781b236263cb7a304c87de59aaa7388640