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

Change-Id: Iffd11fbd80c16bc73526d6f883762940b6b1732e