am a92e95e5: am 064fab54: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev

* commit 'a92e95e5d9c7e6a35541708a0a51ce9b54704b17':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats