Add better support for importing from multiple SIMs

For I102f4f14ae976e550f65c83ee695d7cdc241e4e1

Test
See I102f4f14ae976e550f65c83ee695d7cdc241e4e1

Bug 31781331
Change-Id: I849e441d1ab42bff135b300b34595eb8ed468005
6 files changed