Merge "Add 'automotive-general-tests' in Android.bp of CtsNetTestCases" into main