am ead0f081: Merge "Add folders to conversation item content description" into ub-gmail-ur14-dev

* commit 'ead0f081264b7b9224a17b193f1bf95c45c048a8':
  Add folders to conversation item content description