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