Merge "Migrate dumpsys tests to CTS_v2"