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

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

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