Merge "Address comments on NetworkStack AIDL v6" am: 0e93810453 am: e468a26c7a

Change-Id: Id385210ccd8d08bc2d15e964bbca25c452a3cde8
tree: 56e31356735286856deb492829841e5ee330e427
  1. core/
  2. services/
  3. tests/