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

Change-Id: Idaaf843d0af6322a2610afefc2d857e63b9532ff