Merge "Delete secondary text in charging animation" into pi-dev am: 5f1fd6023f
am: 74ac3aec34

Change-Id: I0cb99e14f56098ccb663a44dee120b34078a029c