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

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

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