[automerger skipped] Merge "TetheringTests: Stop using @hide Wifi P2P APIs" am: 57726b758e am: e87929a4b8 am: 8b9a742ff4 -s ours
am skip reason: Change-Id I41edd697017f4ce59e6707302bebc0da3d75831d with SHA-1 798a92b2a6 is in history

Change-Id: I4a384a120904cbdb5080b2a93da69b8f793b8a97