Merge "p2p: only gate sensitive API by location settings" into qt-dev
am: d4c29971f4

Change-Id: Ieda7b81d81513cf0cf473c2728e93af119f22411
tree: 61d8d6807fc7a18da8d38954ccedacb776257e49
  1. service/
  2. PREUPLOAD.cfg