Merge "Remove unused variable" am: 913b20ba5f am: 1fa5d8f664

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

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