Merge "Refactor all tests inheriting from BluetoothBaseTest as per b/137199892"

Bug: 137199892
Test: manual
Change-Id: I040c91a04a132e5d6fe2fc8da9820a7bfc796f6b
diff --git a/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py b/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py
index afdef11..c38fc93 100644
--- a/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py
+++ b/acts/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py
@@ -47,13 +47,10 @@
     max_advertisements = -1
     advertise_callback_list = []
 
-    def __init__(self, controllers):
-        BluetoothBaseTest.__init__(self, controllers)
-        self.scn_ad = self.android_devices[0]
-        self.adv_ad = self.android_devices[1]
-
     def setup_class(self):
         super().setup_class()
+        self.scn_ad = self.android_devices[0]
+        self.adv_ad = self.android_devices[1]
         self.droid_list = get_advanced_droid_list(self.android_devices)
         self.max_advertisements = self.droid_list[1]['max_advertisements']