Merge "Freeze the networkstack-aidl-interfaces interface"