[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801 -s ours am: 68af3f0c -s ours
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 c6553cc0 is in history
Change-Id: I2c6ca6002e56ccd7ee7fa79512bc8cfb9e34efb6