Merge "Use correct method for checking NETWORK_SETUP_WIZARD permission" into qt-dev am: 6a5bb86797
am: 8739993488

Change-Id: I7421fac2e1feb0b44d2936217b079b9cbba71280
tree: 971fd40bc0b793be0bfd44909ed4e843c6ce293e
  1. service/
  2. PREUPLOAD.cfg