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

Change-Id: I75de53092f4170267f87884986e88e961b740aa0