Merge "Add Network Watchlist adb test commands"