Merge "Revert "Add TEST_MAPPING for debuggerd CTS"" into main