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

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

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