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

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

Change-Id: I17bef54ba8415a960d7a0382d1715f96663c492c