Clock: Second Clock from Provision Team (2/2)

Conflicts:
	res/values-ko/dokdo_strings.xml
	res/values/slim_strings.xml

Change-Id: I1c4bdb8aa4c1c2d653c1a568531b47edc3ab76fc