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

* commit 'dd2f703e28f51741fd0d13b7ab86200b14c512cf':
  CTS: DO tests for DISALLOW_CONFIG_VPN