Merge changes from topic "refactor-routing-coordinator-staticlib" into main am: b287f49c15 am: 0b62aca0bb

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

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