[automerger skipped] Merge "Freeze networkstack-aidl-interfaces as version 3." am: 0ab113620e am: 640d6068aa -s ours
am: d024999bd8 -s ours
am skip reason: change_id I22333c3c5930415cc43d83bc8cc6f566d0acb1f2 with SHA1 a9690c1f66 is in history

Change-Id: I77a352b546fbfb1e5ebf49504bfeb287fc5f666b