Location toggle enhancements [2/2]

Configurable cycling toggle between location modes

Change-Id: I3a1c54a89335c4742a7d0648749aa9abfc8d8367
Signed-off-by: kecinzer <kecinzer@gmail.com>
Merge "Location toggle enhancements [2/2]" into kitkat