[automerger skipped] Freeze networkstack and ipmemorystore stable AIDL to...
[automerger skipped] Freeze networkstack and ipmemorystore stable AIDL to version 5. am: 2eb7b002 am: 6fd8d048 am: c629d6db am: e4f30b53 -s ours
am skip reason: Change-Id I1e74864a51f7d2c5c5cb59427cdcfa3e6d22f5a5 with SHA-1 d762752a is in history
Change-Id: Ibfa3f70100cd2d8762b2648673751b03b9c6046d