Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb
am: 58d08de0c6

Change-Id: I618c950426976dd1899284d0c249ea7b4e45b479