Merge "Fix ktlint errors" into main am: c759b039ac am: 309da270ce

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

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