Merge "Add CtsWifiNonUpdatableTestCases to test mapping" into main