Merge "Address linter errors" into main am: 9c163e4207

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

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