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

Change-Id: Ic25491639af34f2ccda9affd201519fb5b6ba2c6