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

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

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