[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 3551e00976 -s ours

am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 e15e61e712 is in history

Change-Id: I34895c81e5abfe3baf155582cf557ce909af5965
tree: 922a40aed2360f20cc24a028b1f384980c05c8c6
  1. core/
  2. services/
  3. tests/