Merge "ClientModeImpl: Remove CMD_ENABLE_P2P & CMD_DISABLE_P2P with P2P service"