p2p: revert incomplete change from auto-merger

The complete change for master branch is under review.

Bug: 168667942
Test: atest FrameworksWifiTests
Change-Id: I45521ffa6f2e4db40ddd469265fa8b316e985433
1 file changed
tree: d5bd29393826178652268686ac8be81b06330406
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg