[automerger skipped] Merge "Freeze networkstack and ipmemorystore stable AIDL...
[automerger skipped] Merge "Freeze networkstack and ipmemorystore stable AIDL to version 5." am: f0498d1d am: 7622639d -s ours
am skip reason: Change-Id Idb488032099c6c9fb6b67db12b50eb1eb884e394 with SHA-1 2eb7b002 is in history
Change-Id: Ib806ecf7e73b26e24148d9ec76f1d3aa02bbfaf2