[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: f1881eb4 am: 512159bf -s ours

am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 7e24fd9a is in history

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

Change-Id: I86e4fca7fbec72a1cdbded8782afa22b211f2967