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

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

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