Merge "healthd.h: add ignorePowerSupplyNames to healthd_config" am: 5424cade40
am: 5af5b26c62

Change-Id: Ib19c22af9355601ee3afdbeda93557236eb294bb