Merge "healthd_mode_charger: unblank the screen only on first frame" am: a8dcef2012
am: ce6c983e5d

Change-Id: Id811770a73ad2f6e46449c29df180544f9ad5e8a