Merge "Switch previous and new code path in setChildChain" am: 02c02a3e83

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

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