Merge "p2p: revise tethering handler for shared group interface support" am: 0bbf289b09 am: bbbe6f7ba5 am: c9bde4be72

Change-Id: I512a950fc395518bc46dd99590bfdcbe3b10bed3