Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev am: 363e70d
am: 9148d2f

* commit '9148d2f74db74e1df017b9c7c73e8cd8fa0c50ff':
  Declare provider.Settings intent for VPN fragment