Enable proper recovery/charge mode detection

Change-Id: I875d97378c42f8f85bf3568be921bc70322c1bc8
Merge "Enable proper recovery/charge mode detection" into cm-11.0