Merge "Fix ktlint errors" into main am: c759b039ac

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

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