am d0ff89bb: am 99b5e99f: Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev

* commit 'd0ff89bb19edc1bb2ba4bfe5077328fa56852e57':
  Provide bluedroid with wakelock access as a temporary fix