Merge "Delete old WifiNotificationController strings."
am: 6daef4499f

Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee