Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575 am: 69da276bc4

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

Change-Id: I99f87ff6e1400e1b4c368deaca6e07b022a37dfe