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

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

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