tree 2a59117613042efcb5117faf88cf03766a1ab448
parent 3829f323f0486252f193cc6b4f80624193aa8f73
parent 65a606481bda57d5c9aafaf533748d6226f4cb8d
author Jordan Liu <jminjie@google.com> 1571093596 -0700
committer android-build-merger <android-build-merger@google.com> 1571093596 -0700

Merge "Use UiccSlot.getEid as cardId" am: ac4e112fb7
am: 65a606481b

Change-Id: Ic5cd82585cac4803a6f095e44ac6f27ea57f1aee