[automerger skipped] Merge "update showing roaming disconnected to point to the new settings UI Bug: 118499811 Test: Manual" am: f95ed2973d am: a292750cda -s ours
am: 6b99dfd390 -s ours
am skip reason: change_id I8a6ff5e92f41a7ecf95892670fcf7a7c84b2a648 with SHA1 fd4f9e5802 is in history

Change-Id: I8bfe3a55a00d509dad6aacfa1773a347355d4580