Merge "healthd: charger: shutdown timer configurable" am: b142458ab3
am: 1b943d9834

Change-Id: I989104d0fe7ba271fdbe3c96ba6d0cd7c7fd8c19