am 11bfc0c4: Merge "Fix 5369428: Use full battery state information when determining charge status" into ics-mr1

* commit '11bfc0c431f57e7aac6190aa77b311c649a01619':
  Fix 5369428: Use full battery state information when determining charge status