Partial revert of I113cf97bb63121b89857a2204625d15b254e5876

This very likely will regress the font size of clocks on secondary
displays, but a partial revert is easier than a full revert.

This also includes some minor cleanup of ClockEventController

Bug: 303798047
Test: Manually checked clock theming
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ddae7230c2819b2a1975eb8d344b6b78d01eae1c)
Merged-In: I2373ecef880c0671bbb418f95c5d3174e546306a
Change-Id: I2373ecef880c0671bbb418f95c5d3174e546306a