Merge "WifiConfigManager: Change to NETWORK_SETTINGS permission check" into oc-dr1-dev
am: cef5247566

Change-Id: If45b09b2a6f01e3c7f571c42e94537c82d8f0923
tree: 09b0ecbfd9b5b8575583ff6a2ddc11825f04131d
  1. service/
  2. PREUPLOAD.cfg