Merge "TetheringTests: Stop using @hide Wifi P2P APIs"