Merge "Modify catch when addInterfaceToLocalNetwork() is called." am: ccd6a0f6c2

am: c7b925063f

Change-Id: Ia160a4cf42e427575a70810d7157e092e47b5992

services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java

@@ -379,7 +379,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
                     // that adding routes that already exist does not cause an
                     // error (EEXIST is silently ignored).
                     mNMService.addInterfaceToLocalNetwork(mIfaceName, toBeAdded);
-                } catch (RemoteException e) {
+                } catch (Exception e) {
                     mLog.e("Failed to add IPv6 routes to local table: " + e);
                 }