Ensure that a 5 minute disconnect will disable battery defender even if active

Test: 'atest HealthTestCases'
Bug: 175614345
Merged-In: If2be0b8ab802a6af45a97f8fbb93348b33455e1f
Change-Id: If2be0b8ab802a6af45a97f8fbb93348b33455e1f
(cherry picked from commit e7ea64063708c806cba5cac0bc85f52c522edf7e)
diff --git a/health/BatteryDefender.cpp b/health/BatteryDefender.cpp
index 277f75a..e7e80c4 100644
--- a/health/BatteryDefender.cpp
+++ b/health/BatteryDefender.cpp
@@ -236,13 +236,16 @@
             case STATE_CONNECTED:
                 if (mTimeChargerPresentSecs > mTimeToActivateSecsModified) {
                     nextState = STATE_ACTIVE;
-                } else if (mTimeChargerNotPresentSecs > kTimeToClearTimerSecs) {
-                    nextState = STATE_DISCONNECTED;
                 }
-                break;
+                FALLTHROUGH_INTENDED;
 
             case STATE_ACTIVE:
-                // Latch unless disabled or unless the health module has restarted (ie. reboot)
+                if (mTimeChargerNotPresentSecs > kTimeToClearTimerSecs) {
+                    nextState = STATE_DISCONNECTED;
+                }
+
+                break;
+
             default:
                 break;
         }