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