[automerger skipped] Address comments on NetworkStack AIDL v6 am: 812baf3e...
[automerger skipped] Address comments on NetworkStack AIDL v6 am: 812baf3e -s ours am: 8dc4e0c8 -s ours
am skip reason: Change-Id I4aac6ff7432472f8a9345fb5785c6314ec8946e4 with SHA-1 0402afcb is in history
Change-Id: I1a02e4af5409db0e668241bb8dfe18dc7c663511