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

Change-Id: Ied1330341c17d8552123a1ef05bd0faa0f6f7d83