Merge "Add a CTS test for carrier config certificates"
am: 001671ad60

Change-Id: Ic78a1f14e9f03365a6af863cfb35fd8f2edd364f