gps: Re-enable GLO & QZSS in US

Test: on-device
Bug: 353579502
Change-Id: I2cb913ae5dae4bf62c7b11a98dcc429b186520c9
diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3
index 7b68fcb..9ab8fc6 100644
--- a/gps.6.1.xml.b3
+++ b/gps.6.1.xml.b3
@@ -57,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -95,6 +96,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/gps.xml.b3 b/gps.xml.b3
index 25081c8..11c0734 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -57,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -95,6 +96,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3
index fb8c15a..8679528 100644
--- a/gps_user.6.1.xml.b3
+++ b/gps_user.6.1.xml.b3
@@ -94,6 +94,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />
 
diff --git a/gps_user.xml.b3 b/gps_user.xml.b3
index 8d15786..d677aef 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -94,6 +94,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
   />