Merge "healthd: Add dock battery support" into cm-11.0
(cherry picked from commit ed81dd4fe2215fff401ae72c567e434218ff426c)