[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 am: da2ec9bd am: 927faf8c -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 24d8a333 is in history
Change-Id: Ia15ec8daf44b8feb0d7559813b5f1c78e890214e