Settings: Show clock enabled/disabled status summary in status bar settings

Change-Id: Iee63538fe695ec1df50841b157f67f3efa0b22df
(cherry picked from commit 8ee022fbce26d3087d294b54840eb62e382c5b17)

Conflicts:
	res/values/cmr_strings.xml
Settings: Option to enable/disable HOME button wake

(cherry picked from commit 57ae77035326cb373e23325455211259f9bd55cc)

Conflicts:
	res/values/cmr_strings.xml