Merge "Fix crashes seen when checking for carrierConfig certificates" into qt-qpr1-dev
am: 848df9895f

Change-Id: Ie61a4409cdda0435633993098097638a474bc8ea