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

[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801 am: 16a23d5b -s ours

am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 f17753ae is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11404932

Change-Id: Ifbe1d663e0ab9752ce24af374b049f45b3d2e263