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

Change-Id: I09559d8b8d056e183eecf9da18b62a24b5e226f0
tree: 04de85d4d5e17c3d3115fe5b9628388f7972fa57
  1. service/
  2. PREUPLOAD.cfg