Merge "Address format check issues" into main am: 9a6f8ccf28

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

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