am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp

Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.