Merge "Update some descriptions and refine code" am: db9f10c8cc

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

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