Merge "Unsaved carrier wifi connection should display carrier in summary" into qt-dev
am: 3d87a9920e

Change-Id: I5731cb832052d61ca29d4840c5f3a58c49d6d0c6