am 3894073c: am fdcb2257: Merge "Fix a deadlock involving BatteryService." into jb-mr1-dev

* commit '3894073c1daa5dc5bf8b459be1e4a60b3832f1bb':
  Fix a deadlock involving BatteryService.