Merge changes from topic "defer-until-active" am: d2c5e3bf46 am: 0e3800d5ef

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

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