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