Merge "gn2bp: Update args.gn in gen_desc_json" am: a50d3cc46f am: 8e74497420 am: 907d26c8f3

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

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