Refactored biometric libraries into common

Test: atest
Bug: 230514750
Change-Id: I47ad020004ffef9646281611a637e1a5208f5573
diff --git a/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp b/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
index d1fe183..d0250af 100644
--- a/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
+++ b/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
@@ -16,14 +16,15 @@
 
 #include "FakeFingerprintEngine.h"
 
-#include <fingerprint.sysprop.h>
-#include "CancellationSignal.h"
-
 #include <android-base/logging.h>
+
+#include <fingerprint.sysprop.h>
 #include <chrono>
 #include <regex>
 #include <thread>
 
+#include "util/CancellationSignal.h"
+
 #define SLEEP_MS(x) \
     if (x > 0) std::this_thread::sleep_for(std::chrono::milliseconds(x))
 #define BEGIN_OP(x)            \