Merge "Rename utils to remove the Kt suffix" am: e639bf3b3a am: 2e46429d98

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

Change-Id: I028c0693d88d6a9311536cec9284de0538a8a535