Merge "Support cross-user VPN calls (with permission)" into mnc-dev