tree 8a693c4311bacf9be39ea8df89f93d51aa815026
parent 1252e25f71f382ef125d2aadd0276287f8b65f0e
parent c8f9efad877ea21679ca44e35684e90cc2a1fdfc
author Jordan Liu <jminjie@google.com> 1571094317 -0700
committer android-build-merger <android-build-merger@google.com> 1571094317 -0700

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

Change-Id: I303be93715277db4935861a1570178791abf481d