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

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

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