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

Change-Id: I069022ca21c0a09ac2eab1b97436223df99a3b1b