Merge "Update VPN preference state after disallow configuring VPN policy has changed."