Change TEST_MAPPING to use test_module_config rather than list options. 1. Keep independent runs of CtsOsTestCases independent 2. Removed unneeded "exclude-flaky" since it is on for all presubmit now. go/test-module-config Verified that the module was included in presubmit and only the expected tests are run for the module: ~/aosp-main-with-phones/system/hwservicemanager Test: atest -v -p .:presubmit	Finding Tests...	Found 'CtsOsTestCases_cts_hwbindertest' as MODULE	Found 'libbinderthreadstateutils_test' as MODULE	Found 'SettingsGoogleUnitTests' as MODULE	x86_64 CtsOsTestCases_cts_hwbindertest	--------------------------------------	android.os.cts (12 Tests)	[1/12] android.os.cts.HwBinderTest#testAccurateMarshallWithExtraSpaceAndOffset: PASSED (52ms)	[2/12] android.os.cts.HwBinderTest#testFullHandleHasNoSingleFileDescriptor: PASSED (1ms)	[3/12] android.os.cts.HwBinderTest#testEmptyHandleHasNoSingleFileDescriptor: PASSED (0ms)	[4/12] android.os.cts.HwBinderTest#testNotEnoughSpaceBecauseOfSizeAndOffset: PASSED (0ms)	[5/12] android.os.cts.HwBinderTest#testNotEnoughSpaceBecauseOfSize: PASSED (1ms)	[6/12] android.os.cts.HwBinderTest#testEmptyNativeHandle: PASSED (0ms)	[7/12] android.os.cts.HwBinderTest#testNotEnoughSpaceBecauseOfOffset: PASSED (0ms)	[8/12] android.os.cts.HwBinderTest#testAccurateMarshallWithExtraSpace: PASSED (1ms)	[9/12] android.os.cts.HwBinderTest#testEmptyHandleInvalidatedAfterClose: PASSED (1ms)	[10/12] android.os.cts.HwBinderTest#testHwBinder: ASSUMPTION_FAILED (2ms)	[11/12] android.os.cts.HwBinderTest#testAccurateMarshall: PASSED (0ms)	[12/12] android.os.cts.HwBinderTest#testSingleFileDescriptor: PASSED (1ms)	x86_64 SettingsGoogleUnitTests	------------------------------	com.google.android.settings.tests.unit (118 Tests)	Summary (Test executed with 1 devices.)	-------	x86_64 CtsOsTestCases_cts_hwbindertest:android.os.cts: Passed: 11, Failed: 0, Ignored: 0, Assumption Failed: 1	x86_64 SettingsGoogleUnitTests:com.google.android.settings.tests.unit: Passed: 118, Failed: 0, Ignored: 0, Assumption Failed: 0	x86_64 libbinderthreadstateutils_test:libbinderthreadstateutils_test: Passed: 4, Failed: 0, Ignored: 3, Assumption Failed: 0 Change-Id: Ide3232dccf82141de0ca9ea1661b93278b210c66 Test-Mapping-Slo-Bypass-Bug: b/335015078 Bug: 379707081 Bug: 370846783 
1 file changed