Fix migration from Email1 to Email2 when using combined inbox.

Bug: 8578254
Change-Id: I2afb7e145664c1e6d10c0cfbf654d835fec8c9f1
2 files changed