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

Change-Id: I785c4c88c32b15cd39126b371289e266e515d26e