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

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

Change-Id: I2ae33bf4fd793e05e3a993a3d9a215153404efe2