[automerger skipped] Merge "Move Setting constants for NetworkStack" into qt-dev
am:9509eb8716-s ours am skip reason: change_id I6820300c412f94989a5fce7bd6c6f2a3b983b96e with SHA1e06af927c9is in history Change-Id: Ie18c6fd8018b870b2476bb503b4929e584faa888
This commit is contained in: