MSIM: Rework statusbar, order signal clusters to match settings

Settings have SIM 1 on left, then SIM 2, etc. Do the same in the
statusbar. Also show the sim slot number in front of each signal
cluster.

Change-Id: I6ce16870af6374958b09a8a9d7d6d510f4561e13
Merge "MSIM: Rework statusbar, order signal clusters to match settings" into cm-11.0
hide search assistant arrow from lockscreen when custom lockscreen is enabled

Change-Id: I02d8286dd9f07cdb1de8a61101e772be35f65fda
SystemUI: Don't try to translate SIM slot numbers

Change-Id: I9cbf8a04e04e363e11465516da7c7f1336c5c10a
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml

Change-Id: I8e0c356472d60c9cd616a13a370ddcb925be6f62
Revert "hide search assistant arrow from lockscreen when custom lockscreen is enabled"

This reverts commit cf1a134343ae7aafbb2c097cf4839d31f0f82bff.
Revert "Stomp on a benefitless, probably problematic, delta that creaped in with ActiveDisplay"

This change breaks lockscreen blur.  If the screen is turned off a second time before
unlocking the device the background is only transparent the next time the screen is turned
on.

enable blur -> screen off -> screen on (blur);  screen off -> screen on (no blur);

This reverts commit 632daaabbfa4ee1c96d8265f9d9292de04c8bf4e.

Change-Id: Ie549c2848f998c5a5e36c23d008452521166d62c
Merge pull request #11 from VanirAOSP/kk44

merge vanir upstream changes