am e4fdda27: (-s ours) am 8810a0c3: am 69b9eff1: Merge "Update Quick Settings...

am e4fdda27: (-s ours) am 8810a0c3: am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means.  Quick settings will no longeer explicitly enable/disable gps and

* commit 'e4fdda27':