[android] Accept both ActivityManager and ActivityTaskManager for reporting TTID and TTFD (#4780)

* Accept both ActivityManager and ActivityTaskManager as reports for TTID and TTFD

* Update src/scenarios/shared/runner.py

Split off the rest of the grep after the ActivityManager or ActivityTaskManager to another grep so that both will be sure to match on ": Displayed...". 

Previous logic was match 'ActivityManager' or '|ActivityTaskManager: Displayed ' which is incorrect.

Co-authored-by: Matous Kozak <[email protected]>

---------

Co-authored-by: Parker Bibus <[email protected]>
Co-authored-by: Matous Kozak <[email protected]>

Author: 3 people

src/scenarios/shared/runner.py

@@ -535,12 +535,12 @@ def run(self):
                 # Create the fullydrawn command
                 fullyDrawnRetrieveCmd = xharness_adb() + [ 
                     'shell',
-                    f"logcat -d | grep 'ActivityTaskManager: Fully drawn {self.packagename}'"
+                    f"logcat -d | grep -E 'ActivityManager|ActivityTaskManager' | grep ': Fully drawn {self.packagename}'"
                 ]
 
                 basicStartupRetrieveCmd = xharness_adb() + [ 
                     'shell',
-                    f"logcat -d | grep 'ActivityTaskManager: Displayed {androidHelper.activityname}'"
+                    f"logcat -d | grep -E 'ActivityManager|ActivityTaskManager' | grep ': Displayed {androidHelper.activityname}'"
                 ]
 
                 clearLogsCmd = xharness_adb() + [