am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE"

* commit 'f9db4ab97e58f15f84642ac133e33bd89107c944':
  Charger: Avoid animation while not charging DO NOT MERGE