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

Change-Id: Ibb0629c963c3c4f31e74458c920fb3f548264275