[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 am: eed63912 -s ours

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11453660

Change-Id: Ie64b7142bb9bc81f8b3bcf1ce213738e15cfcd10