Merge "CtsMediaRecorderTestCases: Cleanup Dynamic Config related changes"