Fix Android Connection Swap Issue (Client Side)

Summary:
- Add CSR and CSR destination to request body
- (unrelated) Rearrange the list of include files

Reviewed By: jknoxville

Differential Revision: D17346429

fbshipit-source-id: ce775998884b73e82a931f4dd8986c659a892b51

xplat/Flipper/FlipperConnectionManagerImpl.h

@@ -6,13 +6,13 @@
  */
 #pragma once
 
-#include "FlipperInitConfig.h"
-#include "FlipperConnectionManager.h"
-#include "FlipperState.h"
 #include <folly/Executor.h>
 #include <folly/io/async/EventBase.h>
 #include <rsocket/RSocket.h>
 #include <mutex>
+#include "FlipperConnectionManager.h"
+#include "FlipperInitConfig.h"
+#include "FlipperState.h"
 
 namespace facebook {
 namespace flipper {
@@ -27,7 +27,10 @@ class FlipperConnectionManagerImpl : public FlipperConnectionManager {
   friend ConnectionEvents;
 
  public:
-  FlipperConnectionManagerImpl(FlipperInitConfig config, std::shared_ptr<FlipperState> state, std::shared_ptr<ConnectionContextStore> contextStore);
+  FlipperConnectionManagerImpl(
+      FlipperInitConfig config,
+      std::shared_ptr<FlipperState> state,
+      std::shared_ptr<ConnectionContextStore> contextStore);
 
   ~FlipperConnectionManagerImpl();