[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into...

[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: 88384a2c am: 2fa5ec53 -s ours

am skip reason: Change-Id If2dc208e55700ab715e466dbd55ba10a74dd9f40 with SHA-1 8adb3802 is in history

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

Change-Id: Iaeeef65e1fb618e5f8393504c5a4447d978ad221