Merge "charger: minui error handling fixups" am: bc31fc62ce am: d6b7711e3d
am: 5690139a03

Change-Id: I18f6d018ebae03decb80b3f547891bd2ac3365da