Merge changes from topic "framework-no-networkstack-aidl" am: 6505a76d78
am: b02b932f46

Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d
tree: 16311b64ba617bcf3bf8934d5e516389fbf119a3
  1. core/
  2. services/
  3. tests/