am 7d0aed2d: am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev automerge: c211857

* commit '7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07':
  Update tint filter after setting gradient drawable state