[automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am: 74867d1661 am: be2028471f
am: ed6c130647 -s ours
am skip reason: change_id I74531ef11d504b232d4f377532d5e0812dbc88db with SHA1 59d474b3c2 is in history

Change-Id: I694f5e54fba6ddc7a9f486b09ddaeaf54d50e9d1