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

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

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