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

Change-Id: I40bfd75b95a299516d08b4fdf699317249156eda