am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom

* commit '79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
  Continuation of the unified account chooser flow.