[automerger skipped] Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2." into qt-dev
am: 9c0f0db7 -s ours
am skip reason: change_id I079018679766738a97b827bc87a6903655f308dd with SHA1 6b93ec01 is in history
Change-Id: Idf0215c4a30400dbae0bb0732e7fbabd09f9b6da