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 am: 65a41d6c

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

Change-Id: Ie339e652260f7c07ecc3f415905a26424a49c5b5