Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev
am: a7c6324340

Change-Id: Ia0265e6401a9c3bee533383988755da02e6a251c