Merge "Add dumpsys network_stack version"
am: 2b0582e2e6

Change-Id: I6b2369a9f9c8fed4d762b98af19a8b1a8f78ff53