Merge "CTS Verifier: fixed Wifi CA Certificate Test failure." into marshmallow-cts-dev
am: c0d7dcf4c7  -s ours

Change-Id: Ie2c57f03e42c99ee9fac6820e312b6ae38073bd4