Fix bluetooth test broken by Service change

http://ag/10468382 was rolledback because it broke bluetooth tests http://b/151715362.
Will cherrypick this change into our internal branch to roll-forward the service change.

Bug: 150451947
Test: Locally
Change-Id: Ib7a92697e8c57fd98514c54df98b510ac11f188e