DeskClock: Add back user-defined world cities

Patchset 2: Rebase dependency

Change-Id: Iefbf8fa2c3d0d537d85cf734300f3ce2df6ae315
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	res/values/slim_strings.xml