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

[automerger skipped] Merge "Add test for NetworkStackService dumpsys version" into rvc-dev am: 5f6620bc am: 4d60cda4 -s ours am: d0f86f47 -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: I419800043e98109e63b51c64ec3774911119be41