Merge "Add getLegacyVpnInfoPrivileged method"