[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into...
[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into rvc-dev am: 92127893 -s ours
am skip reason: Change-Id If52c689f414cc0730226306dae7d84a0283ef273 with SHA-1 2c18f6b2 is in history
Change-Id: Ic1ce7ad56d42d49cc977aab44c0176d6e29b8060