Fix mismerge of implement 1% battery on select devices

Change-Id: I2dcafba2c39f50cf435b90ca261b325c10fd5b6b
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2