[MessageTest] Add re-tries for flaky tests

1.) Add re-tries to the flaky tests
2.) Add missing UUIDs

Bug: 149035368
Bug: 148877441
Test: Verified the changes
Change-Id: Ic5472556408c18f3a06465c8706333cb4efc0825
diff --git a/acts/tests/google/wifi/WifiDppTest.py b/acts/tests/google/wifi/WifiDppTest.py
index 77471a8..85d2523 100644
--- a/acts/tests/google/wifi/WifiDppTest.py
+++ b/acts/tests/google/wifi/WifiDppTest.py
@@ -904,12 +904,14 @@
         use_mac=True,
         cause_timeout=True)
 
+  @test_tracker_info(uuid="23601af8-118e-4ba8-89e3-5da2e37bbd7d")
   def test_dpp_as_initiator_configurator_fail_r2_no_ap(self):
     asserts.skip_if(self.dpp_r1_test_only == "True",
                     "DPP R1 test, skipping this test for DPP R2 only")
     self.start_dpp_as_initiator_configurator(
       security=self.DPP_TEST_SECURITY_PSK, use_mac=True, r2_no_ap=True)
 
+  @test_tracker_info(uuid="7f9756d3-f28f-498e-8dcf-ac3816303998")
   def test_dpp_as_initiator_configurator_fail_r2_auth_error(self):
     asserts.skip_if(self.dpp_r1_test_only == "True",
                     "DPP R1 test, skipping this test for DPP R2 only")
diff --git a/acts/tests/google/wifi/WifiMacRandomizationTest.py b/acts/tests/google/wifi/WifiMacRandomizationTest.py
index 9461cbb..7456f8a 100644
--- a/acts/tests/google/wifi/WifiMacRandomizationTest.py
+++ b/acts/tests/google/wifi/WifiMacRandomizationTest.py
@@ -347,7 +347,7 @@
         """
         self.check_mac_persistence(self.wpapsk_2g, TOGGLE)
 
-    @test_tracker_info(uuid="a514f-8562-44e8-bfe0-4ecab9af165b")
+    @test_tracker_info(uuid="b3aa514f-8562-44e8-bfe0-4ecab9af165b")
     def test_persistent_mac_after_device_reboot(self):
         """Check if MAC is persistent after a device reboot.
 
diff --git a/acts/tests/google/wifi/WifiNetworkRequestTest.py b/acts/tests/google/wifi/WifiNetworkRequestTest.py
index ed2bf12..c115b48 100644
--- a/acts/tests/google/wifi/WifiNetworkRequestTest.py
+++ b/acts/tests/google/wifi/WifiNetworkRequestTest.py
@@ -424,7 +424,7 @@
         finally:
             self.dut.droid.wifiStopTrackingStateChange()
 
-    @test_tracker_info(uuid="760c3768-697d-442b-8d61-cfe02f10ceff")
+    @test_tracker_info(uuid="caa96f57-840e-4997-9280-655edd3b76ee")
     def test_connect_failure_user_rejected(self):
         """
         Initiates a connection to network via network request with specific SSID
diff --git a/acts/tests/google/wifi/WifiPasspointTest.py b/acts/tests/google/wifi/WifiPasspointTest.py
index b38815f..962d9db 100755
--- a/acts/tests/google/wifi/WifiPasspointTest.py
+++ b/acts/tests/google/wifi/WifiPasspointTest.py
@@ -343,6 +343,7 @@
         wutils.wait_for_disconnect(self.dut)
 
 
+    @test_tracker_info(uuid="37ae0223-0cb7-43f3-8ba8-474fad6e4b71")
     def test_install_att_passpoint_profile(self):
         """Add an AT&T Passpoint profile.
 
diff --git a/acts/tests/google/wifi/aware/functional/MessageTest.py b/acts/tests/google/wifi/aware/functional/MessageTest.py
index 9bfb932..040f4e4 100644
--- a/acts/tests/google/wifi/aware/functional/MessageTest.py
+++ b/acts/tests/google/wifi/aware/functional/MessageTest.py
@@ -19,6 +19,7 @@
 
 from acts import asserts
 from acts.test_decorators import test_tracker_info
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
 from acts.test_utils.wifi.aware import aware_const as aconsts
 from acts.test_utils.wifi.aware import aware_test_utils as autils
 from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
@@ -407,6 +408,7 @@
     ############################################################################
 
     @test_tracker_info(uuid="a8cd0512-b279-425f-93cf-949ddba22c7a")
+    @WifiBaseTest.wifi_test_wrap
     def test_message_no_queue_min(self):
         """Functional / Message / No queue
     - Minimal payload size (None or "")
@@ -421,6 +423,7 @@
         self.run_message_no_queue(self.PAYLOAD_SIZE_TYPICAL)
 
     @test_tracker_info(uuid="c984860c-b62d-4d9b-8bce-4d894ea3bfbe")
+    @WifiBaseTest.wifi_test_wrap
     def test_message_no_queue_max(self):
         """Functional / Message / No queue
     - Max payload size (based on device capabilities)
diff --git a/acts/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py b/acts/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py
index 2a1cb92..af252c7 100644
--- a/acts/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py
+++ b/acts/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py
@@ -78,7 +78,7 @@
         wutils.verify_mac_not_found_in_pcap(self.dut2, self.dut2_mac, packets)
 
     """Test Cases"""
-    @test_tracker_info(uuid=" d04e62dc-e1ef-4cea-86e6-39f0dd08fb6b")
+    @test_tracker_info(uuid="d04e62dc-e1ef-4cea-86e6-39f0dd08fb6b")
     def test_p2p_discovery_sniffer(self):
         """Verify the p2p discovery functionality
         Steps:
diff --git a/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py b/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
index e19993d..da0ba4b 100644
--- a/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
+++ b/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
@@ -1044,7 +1044,7 @@
             s_config=None,  # no updates
             expect_discovery=False)
 
-    @test_tracker_info(uuid="ec6ca57b-f115-4516-813a-4572b930c8d3")
+    @test_tracker_info(uuid="3938a3dc-8032-4096-b184-b528e4564b5e")
     def test_ranged_updated_discovery_solicited_active_multi_step(self):
         """Verify discovery with ranging operation with updated configuration:
     - Unsolicited Publish/Passive Subscribe