Merge "gn2bp: delete unused function" am: b7b3b749f1 am: 895691e313 am: 682a5b674f

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

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