Merge "Address comments on NetworkStack AIDL v6" am: bfc85a162a

Change-Id: I755d14877a65b359c0837cab1488875d7238440e
tree: 88923b9a71a8a485383a6703b07e4be46f30bc14
  1. core/
  2. services/
  3. tests/