Merge "Allow logcat logs to be collected on synchronous runs, mainly to collect logcat logs for system server watchdog errors" into main