Merge "Avoid rely on NETWORK_STACK permission for InetDiagSocketTest" into rvc-dev am: 4376550b5b am: cbde20de36 am: ea94468253

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

Change-Id: I73ec9247d181d381853b13ad669df981d70a5228