Merge "Fix ImpossibleNullComparison errorprone warning" into main am: 1614fc4180

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3011721

Change-Id: I304445a194fed04a6cd3542eb19678d92d06edbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/fuelgauge/batteryusage/bugreport/BatteryUsageLogUtils.java

@@ -95,7 +95,7 @@ public final class BatteryUsageLogUtils {
                         .append(ConvertUtils.utcToLocalTimeForLogging(entry.getTimestamp()))
                         .append(" " + entry.getAction());
         final String description = entry.getActionDescription();
-        if (description != null && !description.isEmpty()) {
+        if (!description.isEmpty()) {
             builder.append(" " + description);
         }
         return builder.toString();