Merge "Address review feedback" into main am: 8ceb02c541

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

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