Merge "Remove hidden API calls from Wifi P2P" am: 9de111c610

Change-Id: I7946d4bb01760ed8b5ac6356b8703a860d97a4fc
tree: 503a4069f2f4792e575cb9d34e7491e2b19036a8
  1. service/
  2. PREUPLOAD.cfg