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

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