gn2bp: Update desc jsons and Android.bp.swp am: c525cb7c22

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

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