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

Change-Id: Ida50dff8604243871d3f93258ea75b45ae25877c