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

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

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