[automerger skipped] Merge "add certs to carrier configs and store them as UiccAccessRules" am: 350c767cfa am: af9598822a am: 9e71ffaa1f -s ours
am: 61798134a8 -s ours
am skip reason: change_id I9f8b5393645171f276c495cf93ee7b8b6ca72b57 with SHA1 bd2c614e69 is in history

Change-Id: I924ada7e2ae37484ff2e8ef773e109cd0464497a