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

Change-Id: Ia2fed0351b86debbd3a621c840adec133d0b5dd8
tree: 507303efa68a41e002912356c15e90206195a2a3
  1. service/
  2. PREUPLOAD.cfg