Merge "Improve logs in checkNrisConsistency" am: f58a955b37 am: 9b540a80b4 am: e278e7e049 am: 05d1bc114b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872875

Change-Id: I6e53180dd0d11a04ab0d2535f1254d04543c49aa

service/src/com/android/server/ConnectivityService.java

@@ -4068,7 +4068,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
                     // Temporary help to debug b/194394697 ; TODO : remove this function when the
                     // bug is fixed.
                     dumpAllRequestInfoLogsToLogcat();
-                    throw new IllegalStateException("This NRI is already registered. " + nri);
+                    throw new IllegalStateException("This NRI is already registered. New : " + nri
+                            + ", existing : " + n);
                 }
             }
         }