Merge "Fix import order" into main am: 26e773718d

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

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