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

Merge "[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801 -s ours am: 68af3f0c -s ours" into rvc-d1-dev-plus-aosp am: 73b1696f -s ours am: 13897ff2 -s ours

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

Change-Id: Ib9bade191b7340a28f7540723b9bb0d1c054f469