Merge "Fix running CtsNetTestCasesLatestSdk errors on NsdManagerTest" into tm-dev