Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter

# Conflicts:
#	client/platforms/android/android_controller.cpp
#	client/platforms/android/android_controller.h

client/protocols/android_vpnprotocol.h

@@ -1,16 +1,11 @@
 #ifndef ANDROID_VPNPROTOCOL_H
 #define ANDROID_VPNPROTOCOL_H
 
-#include <QAndroidBinder>
-#include <QAndroidServiceConnection>
-
 #include "vpnprotocol.h"
 #include "protocols/protocols_defs.h"
 
 using namespace amnezia;
 
-
-
 class AndroidVpnProtocol : public VpnProtocol
 {
     Q_OBJECT
@@ -35,7 +30,6 @@ protected:
 
 private:
     Proto m_protocol;
-
 };
 
 #endif // ANDROID_VPNPROTOCOL_H