Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2."
am: e3cc932d27

Change-Id: Id9f6d26a2dacdb2b57eaf27441fe2a94bf76eb74