Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev