[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 675ec9d30e am: d24ff42f00 am: da2ec9bddd am: 8ae7444003 -s ours am: 8927e31667 -s ours

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

Change-Id: Iae66b84967441cfcceab884b2cfe81fbc0589432
tree: 90e2a994c35fc691f9992996286fcdbb659c999c
  1. Tethering/