Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev