DO NOT MERGE Update setting to be bubbles not badging

Test: atest NotificationMangerTest NotificationManagerServiceTest
Fixes: 142166809
Change-Id: I3ac5410a5185ef78cb0f90d05738191efca02de8
(cherry picked from commit 8527dcb20bce188766985cedfd5553e22808ff17)
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 3eb442f..35268fe 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1450,7 +1450,7 @@
             } else {
                 // Secure => Global
                 Settings.Secure.putInt(resolver,
-                        Settings.Secure.NOTIFICATION_BADGING,
+                        Settings.Secure.NOTIFICATION_BUBBLES,
                         globalSettingValue);
             }
         }