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

Change-Id: Id6fbb069f59aed4f37598d8a9451ce33dcacd6e4