[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into...
[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 675ec9d3 am: 164b377f -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 b955ac2f is in history
Change-Id: I1b2900d70d1c326428f51f0c4ed28049aabd33ef