[automerger skipped] Merge "Add test for NetworkStackService dumpsys version"...
[automerger skipped] Merge "Add test for NetworkStackService dumpsys version" into rvc-dev am: 5f6620bc am: b785624b -s ours
am skip reason: Change-Id Icaab91d2cb4c62930f969612545e369f09f1b0c7 with SHA-1 8298fd53 is in history
Change-Id: I44a4c788261157324462566f9fc79595e38b9733