Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev