DO NOT MERGE: Revert broken CAF signal cluster layout

Squash of the following commits:

Revert "Fix for data and roaming icons"

This reverts commit 233959988e6bc6be2dfcbc94378d2ce8127a77aa.

Revert "SystemUI: Customize StatusBar for Chinese carrier"

This reverts commit 228bccb9d9eaabf9b3884500e4351fa5091be5aa.

Change-Id: I96f7ba1c95b66fd34c10748b1423330362980c34

Revert "StatusBar: Add support to show data and wifi activities."

This reverts commit 81e78b89673f428bbd59e2d1bbbed3030265c0e6.

Change-Id: Ia5a08b695698d01edda59fcb178052660a13115d