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

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

Change-Id: I9263c1ede3fd0558c269ce0aeb5acd941f971860