Merge "Merge "remove getChargeCounter() > 0 check from BatteryIncidentTest" into oreo-cts-dev am: adfbfab6b2  -s ours"
am: 0180fb8b4d

Change-Id: I66b161346f3410a60af8c074fdfa5059e6f653cf