Merge "TetheringTests: Stop using @hide Wifi P2P APIs" am: 57726b758e am: e87929a4b8

Change-Id: Ifcfcfcceda89add886c2b99b5f4647d83d3967d9