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

Change-Id: I9056e3f773355a61a64531973a5486e177739633