Merge "rusty-gd: switch added services based on module under test" am:...

Merge "rusty-gd: switch added services based on module under test" am: 3a7b9c01 am: defa9fd5 am: 73589bdb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1497017

Change-Id: I8eeb538f4581a6640b858ae9be26f3f94769f730