Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev am: 76812ac8ac
am: 73f1a5a758

Change-Id: I92d40150cc37c744fed43857cdd929f1da721759