Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev