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

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

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