Base: fix icon overflowing with centre clock

Based on @maxwen commits
1 - https://github.com/maxwen/frameworks_base/commit/5b4d7714ea5fcc493712b569f456f655bf696076
2 - https://github.com/maxwen/frameworks_base/commit/5b4d7714ea5fcc493712b569f456f655bf696076
3 - https://github.com/maxwen/frameworks_base/commit/b5f7820e50fd03522b5462777779a4520594c796

All credits goes to him.

Change-Id: I86dd9b133adc917d8590a7b3c28abd30ccea48f4

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java