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

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

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