am 6a1c15a6: Merge "Use TransactionSafeActivity" into ub-contactsdialer-a-dev

* commit '6a1c15a636db5f2c54c0c79405337482608bb9f1':
  Use TransactionSafeActivity