Merge "Add null check for wireless charging animation." into pi-dev
am: fa404791b7

Change-Id: I4a2bd1700604c1c3aae757cf3f284354bd197aa8