Merge cherrypicks of ['googleplex-android-review.googlesource.com/28005500', 'googleplex-android-review.googlesource.com/28056600'] into 24Q3-release.

Change-Id: I3db921a415371f74855eb4a7cf948d33efd3ce0b

chre_flags.aconfig

diff --git a/chre_flags.aconfig b/chre_flags.aconfig
index 750d671..78fe231 100644
--- a/chre_flags.aconfig
+++ b/chre_flags.aconfig
@@ -51,6 +51,23 @@
 }
 
 flag {
+  name: "reconnect_host_endpoints_after_hal_restart"
+  namespace: "context_hub"
+  description: "Reconnect host endpoints of ContextHubService after Context Hub HAL restarts."
+  bug: "348253728"
+}
+
+flag {
+  name: "bug_fix_reduce_lock_holding_period"
+  namespace: "context_hub"
+  description: "A flag guarding the fix of reducing lock holding period to avoid deadlock."
+  bug: "347392749"
+  metadata {
+    purpose: PURPOSE_BUGFIX
+  }
+}
+
+flag {
   name: "reliable_message"
   is_exported: true
   namespace: "context_hub"

host/common/hal_client.cc

diff --git a/host/common/hal_client.cc b/host/common/hal_client.cc
index de5a24d..9b4086e 100644
--- a/host/common/hal_client.cc
+++ b/host/common/hal_client.cc
@@ -47,7 +47,7 @@
 }
 
 bool HalClient::reduceLockHolding() {
-  return flags::reduce_lock_holding_period();
+  return flags::bug_fix_reduce_lock_holding_period();
 }
 
 std::unique_ptr<HalClient> HalClient::create(