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

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

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