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

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

Change-Id: Ibc5373ed239564a1df609962de3da951bc093669