Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: Iff1bf360127b882d215485ddf926f0b20815983c
Change-Id: I36dea3d85ca6aaea11f10da12da7d3cb0ede4ba4
diff --git a/pla/android/loc_pla.h b/pla/android/loc_pla.h
index 6104bfb..ab8c75e 100644
--- a/pla/android/loc_pla.h
+++ b/pla/android/loc_pla.h
@@ -39,7 +39,6 @@
 #endif
 
 #include <cutils/properties.h>
-#include <cutils/threads.h>
 #include <cutils/sched_policy.h>
 #include <cutils/android_filesystem_config.h>
 #include <string.h>
diff --git a/pla/oe/loc_pla.h b/pla/oe/loc_pla.h
index e795a23..1e3d6c5 100644
--- a/pla/oe/loc_pla.h
+++ b/pla/oe/loc_pla.h
@@ -52,7 +52,6 @@
 
 #ifndef FEATURE_EXTERNAL_AP
 #include <cutils/properties.h>
-#include <cutils/threads.h>
 #include <cutils/sched_policy.h>
 #endif /* FEATURE_EXTERNAL_AP */
 #include <pthread.h>