Merge "Merge "Add new modules to TEST_MAPPING" into udc-mainline-prod am: 5042555458" into main