[automerger skipped] Merge "Update getUiccCardsInfo doc" am: 39fbf96b5a am: 88f125c096 -s ours
am: 094c2dc6db -s ours
am skip reason: change_id Id89fa48f119004b6c18bd21791396bc6c3df2c95 with SHA1 6c8e0f3f53 is in history

Change-Id: Id6371c9585bb33156b1e9b55f3275407f53a4aef