Merge "Modify catch when addInterfaceToLocalNetwork() is called."

am: ccd6a0f6c2

Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097

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);
                 }