Merge "Fixing incorrect check in BatteryIncidentTest." into pie-cts-dev
am: f0b26240e1

Change-Id: I48df394ba390637facda573c0e328501bc58c1f2