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