Merge "CTS: DO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: dd2f703e28
am: 045cfb1011

* commit '045cfb101119e5288bfcfbc433834f95a1b07a94':
  CTS: DO tests for DISALLOW_CONFIG_VPN