clatutils - code cleanup am: 26b8e85a14

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

Change-Id: I299cea85f34e1a92a382e38e097d4f9161b9be20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>