Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev