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

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