Merge "Fix flaky test: testNsdManager_registerOffloadEngine" into main