Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev am: e49034996e
am: 34d56ee82c

Change-Id: I4804c913b304d04e286f53adaa359819abae60db