Merge "Freeze the networkstack-aidl-interfaces interface"
am: 950767f9f9

Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779