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

Change-Id: I3f5e4a17a3b7f7205c8bb1e6fba4328b704b902a