Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2." am: e3cc932d am: 557ce142 am: 4570f866 Change-Id: I190db1c685bd81ded6bb455f7e8f7f98dbb4877f