[automerger skipped] Merge "add certs to carrier configs and store them as...
[automerger skipped] Merge "add certs to carrier configs and store them as UiccAccessRules" am: 476bbc62 am: be4c0539
am: a2bfc007 -s ours
am skip reason: change_id Ia9283dee566c5ab176cb3ac04cd440b315a2c2a5 with SHA1 659bfe3a is in history
Change-Id: I74add8ab8ac3da55dfb7134b947d71893739991b