Merge changes I52e286c3,Id8081d5d into ub-contactsdialer-i-dev

* changes:
  Unsuppress SIM import UI test
  Make SIM import UI tests less flaky