Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I97a78a9157007cc804d958dd1353ecfe83add93d
Change-Id: Icbb8c855df99fd3f6e39abb3ca3d4436c1b0dac9

pla/android/loc_pla.h

diff --git a/pla/android/loc_pla.h b/pla/android/loc_pla.h
index 34cb591..ec2e144 100644
--- a/pla/android/loc_pla.h
+++ b/pla/android/loc_pla.h
@@ -40,7 +40,6 @@
 #endif
 
 #include <cutils/properties.h>
-#include <cutils/threads.h>
 #include <cutils/sched_policy.h>
 #include <cutils/android_filesystem_config.h>
 #include <string.h>

pla/oe/loc_pla.h

diff --git a/pla/oe/loc_pla.h b/pla/oe/loc_pla.h
index 268b6bf..aeeade0 100644
--- a/pla/oe/loc_pla.h
+++ b/pla/oe/loc_pla.h
@@ -75,7 +75,6 @@
 
 #ifndef FEATURE_EXTERNAL_AP
 #include <cutils/properties.h>
-#include <cutils/threads.h>
 #include <cutils/sched_policy.h>
 #else
 #define set_sched_policy(a, b)