Merge "Remove Connect/Disconnect button dependence on WifiEntry.isExpired()" into rvc-dev am: 02e712ce42
am: ea3269b447
Change-Id: I1ab869ef6b18808fdf344163cd155dfa2fb8bb4e
This commit is contained in: