Merge "Leave spaces between Operator name and Clock in StatusBar" am: 375af769e6
am: 3832515acf

Change-Id: I80224e5a1cfa6433255d737f8943e4ce35932a53