Merge "gn2bp: Add apply patch function to gen_desc_json.sh" am: e14ccfce57

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

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