Merge "p2p: mirgrate p2p into tethering modes"
am: baf9025bbf

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