Merge changes from topic "framework-no-networkstack-aidl" am: 74867d1661
am: be2028471f

Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d