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