am f229ac42: am 7525c2e5: am 836a2cef: am d126fce2: Merge "Change folder chip alignment to align with the baseline" into ub-gmail-ur14-dev

* commit 'f229ac42cc86289918b336a0b6baae4e6b308794':
  Change folder chip alignment to align with the baseline