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

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

Change-Id: I89f407506bf633fe17d23832192b9f94d8accb68