am 64d95bae: Merge "Utility methods for new contact editor flow" into ics-factoryrom

* commit '64d95bae817be522e576ece311fa17d88a4c627c':
  Utility methods for new contact editor flow