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

Change-Id: I05998104c4d19d35cf8eba6b2a4aa1b35dfb600a