Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

PS: THIS MERGE REMOVES THIS COMMIT: https://github.com/cristianomatos/android_frameworks_base/commit/5b70f5b8144bfddbbd8a76e56e9396236e1ec249
    CRDROID HAVE CENTER CLOCK FOR A LONG TIME GO AND I'VE ALREADY MADE THIS CHANGES HERE: https://github.com/cristianomatos/android_frameworks_base/commit/ea920fd4959db1ff28278f5e470f191ad9aed1a1

Conflicts:
	packages/SystemUI/res/layout/msim_status_bar.xml

Change-Id: Id4b5eab86feb65a29000cd90f4f28d5f252b74f6