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

Change-Id: I6fff83b1b4996cff841ef1dbdf106bf7a2482576