[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" into qt-qpr1-dev-plus-aosp
am: b610e3d0 -s ours
am skip reason: change_id Ia9283dee566c5ab176cb3ac04cd440b315a2c2a5 with SHA1 b8d40e5a is in history
Change-Id: I69d666b967c6d3cf5cb82a4221d2f0ec1a4ec068