Merge "Update CarWatchdogDaemon CTS test with correct dumpsys flags." into sc-dev