[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: cc9f73cad3 -s ours am: 4d1c237b8c -s ours am: f3b563809d -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 f577197908 is in history
Change-Id: Ic12643bc9442df4f42ee4de96f42a15992f15828
This commit is contained in: