Merge "Change the owners of vpn2 settings again" into qt-dev
am: de827cb353

Change-Id: I1d52a9100570718b14decb68a742d3933b3e85b7