[automerger skipped] Fix NetworkStackCoverageTests on Q am: af558386 am:...
[automerger skipped] Fix NetworkStackCoverageTests on Q am: af558386 am: 7b0859b1 -s ours am: 79b8d9eb -s ours
am skip reason: Change-Id I3ae98e24a542c6313e06bcc787ad5a0a2a1db723 with SHA-1 af558386 is in history
Change-Id: If8f1fe0a1f3526d73776f025e7874ae08f4ba4a9