Merge "gn2bp: Update desc.json & Android.bp after trimming third-parties" am: 39fd1af819 am: 90d2568d45 am: afc69c6471

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

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