Merge "Fix occasional hang when loading from SIM" into ub-contactsdialer-h-dev am: 219d224fe5
am: c9cdfe2056

Change-Id: Ia2c512dcb10b1ef5664bdb6069e30b241e5c53e6