Merge "Merge "QS: Use current tile state when removing custom tiles" into...
Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5 am: f19fdfb0" into nyc-mr1-dev-plus-aosp
am: 094bdf7f
* commit '094bdf7f':
Change-Id: I035da877c023d82a35a300f1926b68cde56da63c