Merge "[automerger skipped] Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2." into qt-dev am: 9c0f0db733 -s ours
am: a3d5b22a9e -s ours
am skip reason: change_id I079018679766738a97b827bc87a6903655f308dd with SHA1 791dd86528 is in history

Change-Id: I83ac0d7a838a05b0fb5209657d4434881e23d0ab