s4-common: start chargeled service in recovery

Change-Id: I5e0d221fcbd61930774932dfe50a687e3c284599
Merge remote-tracking branch 'cm/cm-11.0' into HEAD