Settings: Improve location modes summary

Change-Id: Idc94015aac1944f4ab1cdf3541cd49d8b00babb2
Settings: Indicate that 'Baton' should not be translated

Change-Id: I64f77839f47192275d32e7766a9c32868ddcebab
Merge branch 'cm-11.0' into kk_mkt