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

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

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