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

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

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