Merge "Remove libstatsmetadata" into rvc-dev am: 2bbfa23bf1 am: 55f3ec8e69 am: de5e0335fd am: 967cd3cb86

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923902

Change-Id: I170c9b377b60e6b27cda94b9b31fcc6cd4944daa
diff --git a/stats/atoms.proto b/stats/atoms.proto
index a5f0ac9..258e4aa 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -4242,6 +4242,19 @@
         INSTALL_FAILURE_STATE_MISMATCH = 24;
         INSTALL_FAILURE_COMMIT = 25;
         REBOOT_TRIGGERED = 26;
+        // Logged after INSTALL_REQUESTED for devices installing a train that
+        // contains no module requiring reboot.
+        REBOOT_NOT_REQUIRED = 27;
+        // Logged after INSTALL_REQUESTED for devices that are installing a train
+        // which requires reboot and eligible for soft restart.
+        SOFT_RESTART_ELIGIBLE = 28;
+        // Logged after INSTALL_REQUESTED for devices that are installing a train
+        // which requires reboot and eligible for notification restart.
+        NOTIFICATION_RESTART_ELIGIBLE = 29;
+        // Logged after INSTALL_REQUESTED for devices that are installing a train
+        // which requires reboot and not eligible for any reboot promotion strategy
+        // (e.g. soft restart, notification restart).
+        NO_REBOOT_PROMOTION_STRATEGY_ELIGIBLE = 30;
     }
     optional State state = 6;
     // Possible experiment ids for monitoring this push.
diff --git a/stats/enums/app/settings_enums.proto b/stats/enums/app/settings_enums.proto
index 69b32c2..50b5ead 100644
--- a/stats/enums/app/settings_enums.proto
+++ b/stats/enums/app/settings_enums.proto
@@ -2664,6 +2664,11 @@
     // OS: R
     DND_APPS_BYPASSING = 1840;
 
+    // OPEN: Settings > System > Gestures > One-Handed
+    // CATEGORY: SETTINGS
+    // OS: R QPR
+    SETTINGS_ONE_HANDED = 1841;
+
     // OPEN: Settings > Battery > Advanced battery option
     // CATEGORY: SETTINGS
     // OS: R