[automerger skipped] Merge "Add server information for pptp vpn" into qt-dev
am: 43110221 -s ours
am skip reason: change_id Ia6b00dd88f8f31823647c56c20b8c7edd20280f7 with SHA1 b38065dd is in history
Change-Id: I88245117b4c90de8faa3d7976213249eaa73b9d4