Merge "update showing roaming disconnected to point to the new settings UI Bug: 118499811 Test: Manual"
am: f95ed2973d

Change-Id: Ie5910a0758875cb3b677bad94ac1df61f09c45e4