SystemUI: Ensure that the Clock is actually enabled in IconMerger

to device if we need to calculate

Change-Id: If12b0e26b32f044f1a82cf8b539283194d1d0b4c

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/IconMerger.java