am f04bcebd: Merge "Enable VPN settings for secondary users" into mnc-dev

* commit 'f04bcebd4e9fdc3323c492059d107043e4d8109a':
  Enable VPN settings for secondary users