tree 40f59e1e5c33157a80ad17c4fdcca10008797303
parent 0f843709832e86d148efe661088b2b9f91534a56
parent eb81f99f6d1224f49f05c71ee6fc9b111b16f6bc
author Jordan Liu <jminjie@google.com> 1571094797 -0700
committer android-build-merger <android-build-merger@google.com> 1571094797 -0700

[automerger skipped] Merge "Use UiccSlot.getEid as cardId" am: ac4e112fb7 am: 65a606481b am: c8f9efad87 -s ours
am: eb81f99f6d -s ours
am skip reason: change_id I0897046386e155e32f2f98effa1654a7b81bd340 with SHA1 01bd00dc1c is in history

Change-Id: I6b457b33b98932e3b9280dc093ef2021d4d857a0