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

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

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