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

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

Change-Id: Ie7cd52942b93de5d0b0dd5be49d1f85afafb4ea7