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

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

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