Merge "perfprofd: use getHealthInfo for get_charging" am: 47096dff0e
am: ff0328ba73

Change-Id: I462e298a09a516b10f6afba8468f976012ffa93c