Merge "Merge "Freeze networkstack-aidl-interfaces as version 3." into qt-dev am: 9ff8ed8292" into qt-dev-plus-aosp
am: 45a15ba4eb

Change-Id: I947e8862b7aa5900a0f46047611f884374f22579