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

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

Change-Id: I7568adefd07a2c6324f26d7e28d442f03a34537f