am b6841a0e: am 9d746d2f: am 91cfc918: am ead0f081: Merge "Add folders to conversation item content description" into ub-gmail-ur14-dev

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