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

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

Change-Id: I04d442b9975ea2ee91d12f33ee3a78a52763ecf7