Merge "Prevent apps from toggling Wifi when in Airplane mode" into oc-dr1-dev
am: 00b23126bf

Change-Id: I810fe42f18a3db4bcd38cd788b3821c5feae6c75
tree: 8eaefc069f802f8ddd6e232fc8215702cbef3e90
  1. service/
  2. PREUPLOAD.cfg