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

Change-Id: Ida50dff8604243871d3f93258ea75b45ae25877c