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: c5da6f82
* commit 'c5da6f82':
Change-Id: I5305d74545fceb1a7763ee486a2d5f95c5c029c2