Merge "Correct the order of import and remove unused definition" am: e6f9de64af am: 97cfd8dede am: a63aba4e33

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

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