am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1

* commit 'da68fd4620088c1cb3a51cd2064885cbcd1ac621':
  Android OS battery usage overstated by screen on time