Fix Location Toggle

When Device only/Off is chosen it will continue to cycle through whatever was previously selected. Also doesn't let you turn off location. Lets fix that.

Change-Id: I97a021df62f584873d675668796437dea54c2d75
Merge remote branch 'aokp/kitkat' into kitkat