[automerger skipped] Merge "[DO NOT MERGE] Remove the server side flag of clockface blacklist" into qt-r1-dev
am: 59c53a10a9 -s ours
am skip reason: change_id I7aa2c2deb690a3c8a5648754eeb6ae10ed0af0d8 with SHA1 9e89ef2a2e is in history

Change-Id: I8f37b26a136b66eb0d00d92c8aef82962291e36f