Merge changes from topic "ms17-multipath" am: bc1f44adb0

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

Change-Id: I6979d343608cafa1e1c7d9d82b07cb857f441e5a