Merge "Use stable networkstack-aidl-interfaces" am: 339f9df7d7 am: 19db347595

Change-Id: Ie5671f3b65a314a1b4f8be9917e02da408e00a53