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