[automerger skipped] Merge "add checking for carrierConfigs certificates for psim"
am: 70c2678ed3 -s ours
am skip reason: change_id I5347f9fbcc736cfbc03057a5917a3b571fafeba3 with SHA1 5d0636e1d6 is in history

Change-Id: Idd5df92dc8243dad5f8ccb904a95dc23bc3b6c6a