Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev