Merge changes I11204b07,I8ad3fb6f into main

* changes:
  Add missing attribution tags to com.android.location.fused
  Add an unstable fallback for the gnss/fused location provider overlay

1 files changed, 14 insertions, 0 deletions

diff --git a/location/java/android/location/flags/location.aconfig b/location/java/android/location/flags/location.aconfig
index f26e72fa79f1..9cc58ae35692 100644
--- a/location/java/android/location/flags/location.aconfig
+++ b/location/java/android/location/flags/location.aconfig
@@ -205,3 +205,17 @@ flag {
     bug: "209078566"
 }
 
+flag {
+    name: "service_watcher_unstable_fallback"
+    namespace: "location"
+    description: "Flag for service watcher to fallback on an unstable service"
+    bug: "402997842"
+    is_fixed_read_only: true
+}
+
+flag {
+    name: "missing_attribution_tags_in_overlay"
+    namespace: "location"
+    description: "Adds missing attribution tags in the Fused and Gnss overlay"
+    bug: "403337028"
+}