Merge "Move the annotation right before String" into main

src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java

@@ -97,9 +97,8 @@ public class BatterySaverSettings extends DashboardFragment {
         }
     }
 
-    @Nullable
     @Override
-    public String getPreferenceScreenBindingKey(@NonNull Context context) {
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
         return BatterySaverScreen.KEY;
     }
 }