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

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

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