Merge "Fix failing bluetooth test (missing permission)" into tm-dev