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

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

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