Merge "Disable custom clock faces in SystemUI" into qt-dev am: 6613ea8da3 am: 311a45c4de
am: de5748e0ee

Change-Id: I2eb87bc2ebdfe5557864fff9b1d528559e8bc3ee