Merge "Color/tint the wifi/mobile status bar icons correctly"
am: b3866aeee2

Change-Id: Ie60f806f1d9ca6ef99cefe422685b9545adfbb79