Merge "p2p: mirgrate p2p into tethering modes" am: 05727ec32d
am: 5cec9c17ec

Change-Id: I618c950426976dd1899284d0c249ea7b4e45b479
tree: 4b133b56dd8cf57880e9f13347f07bce6c558fe7
  1. core/
  2. services/
  3. tests/