Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a am: 48947de481
am: 12ced26813

Change-Id: I4c4251257c7ddcff82460dd71ff62adecd900420