[automerger skipped] Use unstable networkstack AIDLs in development branches am: ff1b31184a am: f19a2f520e -s ours

am skip reason: Change-Id Iae5eb6d6a7ea38cd8e2537f1eb83190ecbae1f87 with SHA-1 b8fcdb96ba is in history

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

Change-Id: Iae05a7cfdfdb4b00c97a2c22f955195f35779260