Merge "[automerger skipped] Merge "Add test for NetworkStackService dumpsys...

Merge "[automerger skipped] Merge "Add test for NetworkStackService dumpsys version" into rvc-dev am: 5f6620bc -s ours am: 8c5b586e -s ours" into rvc-d1-dev-plus-aosp am: ae229486 -s ours am: 977bc76c -s ours

am skip reason: Change-Id Icaab91d2cb4c62930f969612545e369f09f1b0c7 with SHA-1 8d081d6d is in history

Change-Id: Ic821dc36b01c829fb597fbd5313be69795e23380