Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da am: f19fdfb08d" into nyc-mr1-dev-plus-aosp
am: 094bdf7f25

* commit '094bdf7f2565582d6df069099a5b73ba06c7b0e3':

Change-Id: I035da877c023d82a35a300f1926b68cde56da63c