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

Change-Id: I4418cad82e478cc835da76dc5524bcbe23bdf592