[automerger skipped] Merge "Freeze Networkstack AIDL API as V6" into rvc-dev...

[automerger skipped] Merge "Freeze Networkstack AIDL API as V6" into rvc-dev am: 76e2b1e7 am: 3bbc506c am: 4aad086a -s ours

am skip reason: Change-Id I01096d4fb9f60b675aae5c3fe5d5a49d9ae0775c with SHA-1 96398053 is in history

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

Change-Id: I66b392ccfdb463fbbc9e130f9ede289c4f7ca879