Merge "Remove location tile from the list of default-enabled QuickSettings...
Merge "Remove location tile from the list of default-enabled QuickSettings tiles" into nyc-mr1-dev am: 8add4866
am: 429048dd
Change-Id: I8bf5c98b4618dd86c0ec7f51f0df17a16a504f36