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

Change-Id: Ife0652af741a0bdb4d4eb9a8a10d0420963de9b3