WiFiInstaller: catch exceptions on both delete paths
am: 881958d4b9

Change-Id: I3dbca2efc49ffa468a21e543baa47412704256c5