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

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

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