Merge "Get rid of upperbound on wireless charging anim" into pi-dev am: 34730143de
am: 81023c45ea

Change-Id: Id5b7c903e997d1cbb92dcf4c5b11c431815fddbf