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

Change-Id: I0696b927603498751365a682769cfa5ab72aea8f