[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: 88384a2c am: 00fc40b6 am: af5a5624 -s ours
am skip reason: Change-Id If2dc208e55700ab715e466dbd55ba10a74dd9f40 with SHA-1 8adb3802 is in history
Change-Id: If9685b91f286f02a4a93121ed98d5ee3f43165c4