Merge changes I03bbd1a2,I51939d1b into ub-contactsdialer-i-dev

* changes:
  Remove support for invitable account types
  Remove some methods from AccountTypeManager