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

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

Change-Id: I361364428b7d5065d7242ad9ad52555b8f479bb4