Merge "Relief unnecessary dependencies of code order" into main am: c022bd47a8

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

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